AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
d2a988512e
qt5base-lts/qmake/library
History
Liang Qi 112a4af107 Merge remote-tracking branch 'origin/5.9' into dev 
Conflicts:
	examples/examples.pro
	qmake/library/qmakebuiltins.cpp
	src/corelib/global/qglobal.cpp
		Re-apply b525ec2 to qrandom.cpp(code movement in 030782e)
	src/corelib/global/qnamespace.qdoc
	src/corelib/global/qrandom.cpp
	src/gui/kernel/qwindow.cpp
		Re-apply a3d59c7 to QWindowPrivate::setVisible() (code movement in d7a9e08)
	src/network/ssl/qsslkey_openssl.cpp
	src/plugins/platforms/android/androidjniinput.cpp
	src/plugins/platforms/xcb/qxcbconnection.cpp
	src/plugins/platforms/xcb/qxcbconnection_xi2.cpp
	src/widgets/widgets/qmenu.cpp
	tests/auto/widgets/kernel/qwidget_window/tst_qwidget_window.cpp

Change-Id: If7ab427804408877a93cbe02079fca58e568bfd3
2017-08-31 14:31:31 +02:00
..
ioutils.cpp Preserve last modification timestamps of installed directories 2017-05-02 10:27:15 +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 Updated license headers 2016-01-21 18:55:18 +00:00
qmakebuiltins.cpp Merge remote-tracking branch 'origin/5.9' into dev 2017-08-31 14:31:31 +02: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 add a bunch of complementary options to -after 2017-02-06 16:34:17 +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 Updated license headers 2016-01-21 18:55:18 +00:00