Liang Qi c7cdf3aac7 Merge remote-tracking branch 'origin/5.6' into 5.7 ... Conflicts: src/corelib/mimetypes/qmimeprovider.cpp src/corelib/mimetypes/qmimetype.cpp Change-Id: Ib483ddb6bfc380e7c8f195feca535703814c3872		2016-08-25 16:12:11 +02:00
..
.gitignore	Move QtConcurrent into its own module	2012-02-05 17:49:16 +01:00
qtconcurrentrun.pro	Tests: Remove CONFIG += parallel_test.	2015-09-05 07:16:50 +00:00
tst_qtconcurrentrun.cpp	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-08-25 16:12:11 +02:00