AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
318b58562a
qt5base-lts/qmake
History
Liang Qi 318b58562a Merge remote-tracking branch 'origin/5.8' into dev 
Conflicts:
	.qmake.conf
	mkspecs/common/msvc-desktop.conf
	mkspecs/common/msvc-version.conf
	mkspecs/common/winrt_winphone/qmake.conf
	mkspecs/features/mac/default_post.prf
	mkspecs/features/mac/sdk.prf
	mkspecs/features/qt.prf
	mkspecs/features/uikit/default_post.prf
	mkspecs/features/winrt/default_pre.prf
	mkspecs/winphone-arm-msvc2013/qmake.conf
	mkspecs/winphone-x86-msvc2013/qmake.conf
	mkspecs/winrt-arm-msvc2013/qmake.conf
	mkspecs/winrt-x64-msvc2013/qmake.conf
	mkspecs/winrt-x86-msvc2013/qmake.conf
	qmake/generators/win32/msvc_vcproj.cpp
	src/gui/kernel/qwindowsysteminterface.cpp
	src/network/kernel/qhostaddress.cpp
	src/plugins/platforms/mirclient/qmirclientplugin.cpp
	src/plugins/platforms/mirclient/qmirclientplugin.h
	src/widgets/util/qsystemtrayicon.cpp
	tests/auto/widgets/itemviews/qlistview/tst_qlistview.cpp
	tools/configure/Makefile.mingw
	tools/configure/Makefile.win32

Done-with: Jake Petroules <jake.petroules@qt.io>
Done-with: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Change-Id: I4be3262d3994e11929d3b1ded2c3379783797dbe
2017-01-25 20:06:06 +01:00
..
doc add depend_includepath to the qmake manual 2017-01-19 21:47:54 +00:00
generators Merge remote-tracking branch 'origin/5.8' into dev 2017-01-25 20:06:06 +01:00
library Merge remote-tracking branch 'origin/5.8' into dev 2017-01-25 20:06:06 +01:00
cachekeys.h Updated license headers 2016-01-21 18:55:18 +00:00
main.cpp moc: get the system #defines from the compiler itself 2016-07-20 02:54:03 +00:00
Makefile.unix Merge remote-tracking branch 'origin/5.8' into dev 2017-01-25 20:06:06 +01:00
Makefile.unix.macos Merge remote-tracking branch 'origin/5.8' into dev 2016-12-13 09:39:20 +01:00
Makefile.unix.mingw configure: put more of the makefile contents into template files 2016-11-23 09:38:14 +00:00
Makefile.unix.unix configure: put more of the makefile contents into template files 2016-11-23 09:38:14 +00:00
Makefile.unix.win32 Merge remote-tracking branch 'origin/5.8' into dev 2017-01-25 20:06:06 +01:00
Makefile.win32 Merge remote-tracking branch 'origin/5.8' into dev 2017-01-25 20:06:06 +01:00
meta.cpp qmake: eradicate Q_FOREACH loops [needing qAsConst()] 2016-01-28 20:25:18 +00:00
meta.h Updated license headers 2016-01-21 18:55:18 +00:00
option.cpp don't pass qmake configure arguments to sub-projects 2017-01-06 20:09:18 +00:00
option.h bump qmake version 2016-11-15 22:43:51 +00:00
project.cpp make qmake abort when $$prompt() gets EOF 2016-12-13 18:55:19 +00:00
project.h Merge remote-tracking branch 'origin/5.7' into dev 2016-07-19 20:14:40 +02:00
property.cpp move generation of qconfig.cpp (and qt.conf) to qmake-based configure 2016-12-13 18:56:12 +00:00
property.h move generation of qconfig.cpp (and qt.conf) to qmake-based configure 2016-12-13 18:56:12 +00:00
qmake_pch.h Updated license headers 2016-01-21 18:55:18 +00:00
qmake-aux.pro revert to building qmake with qconfig.cpp 2017-01-06 20:09:08 +00:00
qmake.pri Clean up building of bootstrap lib and tools 2016-10-11 06:04:54 +00:00
qmake.pro configure: delete some dead code and outdated comments 2016-11-23 09:38:09 +00:00