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
..
qcolordialog	Updated license headers	2016-01-21 18:55:18 +00:00
qdialog	Remove references to obsolete platforms	2017-11-05 06:33:53 +00:00
qerrormessage	Updated license headers	2016-01-21 18:55:18 +00:00
qfiledialog	QWidgetWindow: don't give focus to windows that are being destroyed	2017-05-30 10:49:36 +00:00
qfiledialog2	Change almost all other uses of qrand() to QRandomGenerator	2017-11-08 09:14:03 +00:00
qfilesystemmodel	QFileSystemModel/Win: Fix file system operations failing due to watchers	2018-01-26 11:36:30 +00:00
qfontdialog	qtbase: Remove BLACKLIST files which are no longer active	2018-02-12 17:40:12 +00:00
qinputdialog	Replace Q_NULLPTR with nullptr where possible	2017-09-19 11:53:55 +00:00
qmessagebox	Merge remote-tracking branch 'origin/5.9' into 5.11	2018-02-14 12:51:24 +01:00
qprogressdialog	Replace Q_DECL_OVERRIDE with override where possible	2017-09-19 11:53:42 +00:00
qsidebar	Support for Q_OS_ANDROID_EMBEDDED and android-embedded build flags	2018-01-20 18:16:59 +00:00
qwizard	QWizard: Do not remove the Next button's shortcut	2017-10-24 16:43:52 +00:00
dialogs.pro	Use qtConfig throughout in qtbase	2016-08-19 04:28:05 +00:00