qt5base-lts/tests/auto/corelib/io/qdir
Liang Qi cbe332405a Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
	configure
	mkspecs/macx-ios-clang/features/default_pre.prf
	mkspecs/macx-ios-clang/features/sdk.prf
	mkspecs/unsupported/freebsd-g++46/qplatformdefs.h
	src/widgets/styles/qgtkstyle.cpp
	tests/auto/corelib/io/qdiriterator/qdiriterator.pro
	tests/auto/corelib/io/qfileinfo/qfileinfo.pro

Change-Id: Ia943555d1e59234a66f7dc65bdfda838e40001b5
2016-06-10 23:27:10 +02:00
..
entrylist Moving relevant tests to corelib/io 2011-08-31 10:08:38 +02:00
resources/entryList Moving relevant tests to corelib/io 2011-08-31 10:08:38 +02:00
searchdir Moving relevant tests to corelib/io 2011-08-31 10:08:38 +02:00
testData Moving relevant tests to corelib/io 2011-08-31 10:08:38 +02:00
testdir Updated license headers 2016-01-21 18:55:18 +00:00
types Moving relevant tests to corelib/io 2011-08-31 10:08:38 +02:00
.gitignore Moving relevant tests to corelib/io 2011-08-31 10:08:38 +02:00
android_testdata.qrc Android: Fix QDir tests 2014-12-22 09:26:49 +01:00
qdir.pro Merge remote-tracking branch 'origin/5.6' into 5.7 2016-06-10 23:27:10 +02:00
qdir.qrc Moving relevant tests to corelib/io 2011-08-31 10:08:38 +02:00
tst_qdir.cpp Merge remote-tracking branch 'origin/5.6' into 5.7 2016-06-10 23:27:10 +02:00