AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
e0b55e8b1c
qt5base-lts/qmake/library
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
..
ioutils.cpp Updated license headers 2016-01-21 18:55:18 +00:00
ioutils.h Updated license headers 2016-01-21 18:55:18 +00:00
proitems.cpp Merge remote-tracking branch 'origin/5.8' into dev 2017-01-25 20:06:06 +01:00
proitems.h qmake: introduce magic bypassNesting() scope 2016-12-13 18:56:20 +00:00
qmake_global.h Updated license headers 2016-01-21 18:55:18 +00:00
qmakebuiltins.cpp move generation of qconfig.cpp (and qt.conf) to qmake-based configure 2016-12-13 18:56:12 +00:00
qmakeevaluator_p.h make QMAKE_DIR_SEP magic on writing 2016-12-20 10:16:32 +00:00
qmakeevaluator.cpp Merge remote-tracking branch 'origin/5.8' into dev 2017-01-25 20:06:06 +01:00
qmakeevaluator.h make qmake abort when $$prompt() gets EOF 2016-12-13 18:55:19 +00:00
qmakeglobals.cpp don't pass qmake configure arguments to sub-projects 2017-01-06 20:09:18 +00:00
qmakeglobals.h don't pass qmake configure arguments to sub-projects 2017-01-06 20:09:18 +00:00
qmakeparser.cpp qmake: introduce magic bypassNesting() scope 2016-12-13 18:56:20 +00:00
qmakeparser.h add discard_from() function 2016-08-25 11:56:07 +00:00
qmakevfs.cpp Merge remote-tracking branch 'origin/5.6' into 5.7 2016-10-01 22:15:55 +02:00
qmakevfs.h Updated license headers 2016-01-21 18:55:18 +00:00