AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
4c0e27ae6f
qt5base-lts/qmake/library
History
Liang Qi 305dd1b61f Merge remote-tracking branch 'origin/5.9' into 5.11 
Conflicts:
	.qmake.conf
	src/corelib/animation/qvariantanimation.cpp
	src/corelib/global/qglobal.cpp
	src/corelib/global/qlogging.cpp
	src/corelib/io/qprocess_win.cpp
	src/corelib/json/qjsonarray.cpp
	src/corelib/tools/qsimd_p.h
	src/corelib/tools/qtimezoneprivate_p.h
	src/corelib/xml/qxmlstream_p.h
	src/gui/kernel/qsimpledrag.cpp
	src/gui/kernel/qsimpledrag_p.h
	src/plugins/generic/generic.pro
	src/plugins/platforms/cocoa/qcocoamenu.mm
	src/widgets/styles/qmacstyle_mac.mm
	tests/auto/concurrent/qtconcurrentmap/BLACKLIST
	tests/auto/corelib/io/qfileinfo/tst_qfileinfo.cpp
	tests/auto/corelib/tools/qdatetime/tst_qdatetime.cpp
	tests/auto/gui/kernel/qwindow/BLACKLIST
	tests/auto/widgets/dialogs/qmessagebox/BLACKLIST

Change-Id: I508d686cf20f7f8cc6a7119b9bc7c3bbb505c58e
2018-02-14 12:51:24 +01:00
..
ioutils.cpp qmake: require a drive in a DOS path for it to be absolute 2018-01-18 13:46:54 +00:00
ioutils.h Preserve last modification timestamps of installed directories 2017-05-02 10:27:15 +00:00
proitems.cpp qmake: make yet more use of ProString::toQStringRef() 2017-08-26 12:11:35 +00:00
proitems.h Merge remote-tracking branch 'origin/5.9' into dev 2017-08-31 14:31:31 +02:00
qmake_global.h
qmakebuiltins.cpp Merge remote-tracking branch 'origin/5.9' into 5.11 2018-02-14 12:51:24 +01:00
qmakeevaluator_p.h qmake: make yet more use of ProString::toQStringRef() 2017-08-26 12:11:35 +00:00
qmakeevaluator.cpp Merge remote-tracking branch 'origin/5.9' into dev 2017-08-31 14:31:31 +02:00
qmakeevaluator.h qmake: remove pointless use of raw data in $$[QMAKEFEATURES] access 2017-08-26 12:12:02 +00:00
qmakeglobals.cpp qmake: require a drive in a DOS path for it to be absolute 2018-01-18 13:46:54 +00:00
qmakeglobals.h add a bunch of complementary options to -after 2017-02-06 16:34:17 +00:00
qmakeparser.cpp Change source identifier type in ProString 2017-08-15 10:54:50 +00:00
qmakeparser.h Change source identifier type in ProString 2017-08-15 10:54:50 +00:00
qmakevfs.cpp Merge remote-tracking branch 'origin/5.6' into 5.7 2016-10-01 22:15:55 +02:00
qmakevfs.h