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
..
animation	QtCore: Remove Windows CE.	2016-03-30 11:22:47 +00:00
codecs	tests/auto/corelib/codecs: clean up	2016-08-06 14:49:21 +00:00
global	Use qtConfig throughout in qtbase	2016-08-19 04:28:05 +00:00
io	Merge remote-tracking branch 'origin/5.7' into 5.8	2016-11-01 06:02:55 +01:00
itemmodels	Merge remote-tracking branch 'origin/5.7' into dev	2016-08-16 07:58:32 +02:00
json	Modularize configure.json/.pri	2016-09-15 08:23:53 +00:00
kernel	Increase the resolution for QDeadlineTimer unit test	2016-10-26 03:16:26 +00:00
mimetypes	tests/auto/corelib/mimetypes: use local QThreadPool	2016-09-17 06:47:05 +00:00
plugin	Convert the old feature system	2016-09-15 08:24:10 +00:00
statemachine	Merge "Merge remote-tracking branch 'origin/5.6' into dev" into refs/staging/dev	2016-01-26 11:27:37 +00:00
thread	winrt: Make test functional	2016-08-09 12:13:23 +00:00
tools	Add Qt::ISODateWithMs date format, with support in QTime/Date/DateTime	2016-10-20 15:15:40 +00:00
xml	tests/auto/corelib/xml: cleanup	2016-08-27 05:09:16 +00:00
corelib.pro	Add support for Apple tvOS	2016-05-17 16:11:23 +00:00