Liang Qi a732576a66 Merge remote-tracking branch 'origin/5.7' into 5.8 ... Conflicts: config.tests/win/msvc_version.cpp configure.pri mkspecs/macx-ios-clang/features/default_post.prf mkspecs/macx-ios-clang/features/resolve_config.prf mkspecs/features/uikit/default_post.prf mkspecs/features/uikit/resolve_config.prf src/corelib/io/qsettings_mac.cpp src/corelib/json/qjsondocument.cpp src/plugins/platforms/cocoa/qcocoawindow.h src/plugins/platforms/cocoa/qcocoawindow.mm src/plugins/platforms/cocoa/qnswindowdelegate.h src/plugins/platforms/cocoa/qnswindowdelegate.mm src/plugins/platforms/ios/ios.pro src/plugins/platforms/ios/kernel.pro src/plugins/platforms/ios/qiosintegration.h src/plugins/platforms/minimalegl/qminimaleglintegration.cpp tests/auto/gui/painting/qpainter/tst_qpainter.cpp tools/configure/environment.cpp Change-Id: I654845e54e40f5951fb78aab349ca667e9f27843		2016-11-01 06:02:55 +01:00
..
qcolordialog	Updated license headers	2016-01-21 18:55:18 +00:00
qdialog	QtWidgets: Remove Windows CE.	2016-04-07 10:24:45 +00:00
qerrormessage	Updated license headers	2016-01-21 18:55:18 +00:00
qfiledialog	Merge remote-tracking branch 'origin/5.7' into 5.8	2016-10-06 20:12:27 +02:00
qfiledialog2	Merge remote-tracking branch 'origin/5.7' into 5.8	2016-08-29 15:30:17 +02:00
qfilesystemmodel	Merge remote-tracking branch 'origin/5.7' into dev	2016-06-13 12:46:46 +02:00
qfontdialog	Merge remote-tracking branch 'origin/5.7' into dev	2016-05-23 21:09:46 +02:00
qinputdialog	Updated license headers	2016-01-21 18:55:18 +00:00
qmessagebox	QtWidgets: Remove Windows CE.	2016-04-07 10:24:45 +00:00
qprogressdialog	Updated license headers	2016-01-21 18:55:18 +00:00
qsidebar	Remove the traces of the discontinued android-no-sdk platform	2016-03-30 10:12:34 +00:00
qwizard	Merge remote-tracking branch 'origin/5.7' into 5.8	2016-11-01 06:02:55 +01:00
dialogs.pro	Use qtConfig throughout in qtbase	2016-08-19 04:28:05 +00:00