qt5base-lts/tests/auto/tools
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
..
moc Merge remote-tracking branch 'origin/5.9' into dev 2017-07-04 16:05:53 +02:00
qdbuscpp2xml remove unnecessary references to $$QMAKE_CFLAGS_DBUS 2016-10-04 20:21:28 +00:00
qdbusxml2cpp remove unnecessary references to $$QMAKE_CFLAGS_DBUS 2016-10-04 20:21:28 +00:00
qmake Adapt qmake's raw-string parser to avoid confusion by macros 2017-08-24 14:27:50 +00:00
qmakelib Merge remote-tracking branch 'origin/5.9' into dev 2017-07-19 09:47:29 +02:00
rcc Make it possible to specify the RCC data version format 2017-02-28 08:44:50 +00:00
uic uic: Use nullptr instead of Q_NULLPTR in generated code 2017-08-28 15:25:07 +00:00
tools.pro