Liang Qi af0d0b9c06 Merge remote-tracking branch 'origin/5.6' into 5.7 ... Conflicts: src/plugins/platforms/ios/ios.pro src/plugins/platforms/ios/kernel.pro src/plugins/platforms/ios/optional/nsphotolibrarysupport/qiosfileengineassetslibrary.h src/plugins/platforms/ios/optional/nsphotolibrarysupport/qiosfileengineassetslibrary.mm src/plugins/platforms/ios/optional/nsphotolibrarysupport/qiosfileenginefactory.h src/plugins/platforms/ios/qiosintegration.h src/widgets/widgets/qcombobox.cpp tests/auto/widgets/dialogs/qwizard/tst_qwizard.cpp tests/auto/widgets/graphicsview/qgraphicsitem/tst_qgraphicsitem.cpp Change-Id: Ibaee7cbbba99e7c4b1d8926e55932ffa6030ce45		2016-10-27 10:23:39 +02:00
..
.gitignore	Moving relevant tests to corelib/io	2011-08-31 10:08:38 +02:00
BLACKLIST	tst_qfilesystemwatcher: Blacklist flaky tests on Windows.	2015-11-17 14:27:23 +00:00
qfilesystemwatcher.pro	Tests: Remove CONFIG += parallel_test.	2015-09-05 07:16:50 +00:00
tst_qfilesystemwatcher.cpp	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-10-27 10:23:39 +02:00