Liang Qi 9967a011ea Merge remote-tracking branch 'origin/5.12' into 5.13 ... Conflicts: qmake/generators/makefile.cpp src/plugins/platforms/cocoa/qcocoaintegration.h src/plugins/platforms/cocoa/qcocoaintegration.mm Done-With: Jörg Bornemann <joerg.bornemann@qt.io> Change-Id: I5a61e161784cc6f947abe370aab8f2971a9cbe78		2019-06-07 13:19:27 +02:00
..
qcolordialog	Fix deprecation warnings in widget autotests	2019-02-08 18:00:51 +00:00
qdialog	Qt Widgets: Make tests pass on High DPI screens and scaling	2019-05-29 12:52:51 +02:00
qerrormessage	Updated license headers	2016-01-21 18:55:18 +00:00
qfiledialog	QtWidgets: mark QFileDialog functions as deprecated	2019-02-12 17:12:41 +00:00
qfiledialog2	Fix deprecation warnings in widget autotests	2019-02-08 18:00:51 +00:00
qfilesystemmodel	Extend blacklisting of dirsBeforeFiles as it's flaky	2019-04-26 16:41:51 +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	Remove dead code	2019-01-04 09:42:14 +00:00
qprogressdialog	tests/auto/widgets/dialogs: Avoid unconditional qWait()s	2018-05-14 10:39:00 +00:00
qsidebar	winrt: make dialog auto tests pass	2018-06-22 05:02:43 +00:00
qwizard	Qt Widgets: Make tests pass on High DPI screens and scaling	2019-05-29 12:52:51 +02:00
dialogs.pro	winrt: Remove qfiledialog and qmessagebox auto tests for now	2018-05-28 06:50:45 +00:00