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
..
qdbusabstractadaptor	Merge remote-tracking branch 'origin/5.9' into 5.11	2018-02-14 12:51:24 +01:00
qdbusabstractinterface	Use dependencies instead of CONFIG+=ordered	2017-12-02 11:09:15 +00:00
qdbusconnection	Properly use the "process" feature	2017-02-27 15:44:46 +00:00
qdbusconnection_delayed
qdbusconnection_no_app
qdbusconnection_no_bus
qdbusconnection_no_libdbus	Autotest: rename the test class so it's different in this test	2016-01-30 03:20:54 +00:00
qdbusconnection_spyhook	tests: Unify license to GPL-EXCEPT	2017-04-03 07:18:46 +00:00
qdbuscontext
qdbusinterface	Use dependencies instead of CONFIG+=ordered	2017-12-02 11:09:15 +00:00
qdbuslocalcalls
qdbusmarshall	qtbase: Remove BLACKLIST files which are no longer active	2018-02-12 17:40:12 +00:00
qdbusmetaobject	Plug leaks in tests/auto/dbus	2017-01-26 10:33:28 +00:00
qdbusmetatype
qdbuspendingcall
qdbuspendingreply
qdbusreply
qdbusservicewatcher
qdbusthreading
qdbustype	Use QT_CONFIG(library) instead of QT_NO_LIBRARY	2017-03-06 11:27:20 +00:00
qdbusxmlparser
dbus.pro	Build examples and tests only if their requirements are met	2017-03-22 15:55:55 +00:00