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
..
testdata/paintEvent	Moved tests into integrationtests/ and widgets/	2011-10-20 19:45:41 +02:00
.gitignore	Moved tests into integrationtests/ and widgets/	2011-10-20 19:45:41 +02:00
BLACKLIST	Blacklisting tst_QWidget::saveRestoreGeometry test on Ubuntu 16.04	2016-08-18 11:37:15 +00:00
geometry-fullscreen.dat	Moved tests into integrationtests/ and widgets/	2011-10-20 19:45:41 +02:00
geometry-maximized.dat	Moved tests into integrationtests/ and widgets/	2011-10-20 19:45:41 +02:00
geometry.dat	Moved tests into integrationtests/ and widgets/	2011-10-20 19:45:41 +02:00
qwidget.pro	remove redundant x11 handling	2016-08-10 15:43:11 +00:00
qwidget.qrc	Moved tests into integrationtests/ and widgets/	2011-10-20 19:45:41 +02:00
tst_qwidget_mac_helpers.h	Updated license headers	2016-01-21 18:55:18 +00:00
tst_qwidget_mac_helpers.mm	Updated license headers	2016-01-21 18:55:18 +00:00
tst_qwidget.cpp	Merge remote-tracking branch 'origin/5.7' into 5.8	2016-11-01 06:02:55 +01:00