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
..
resources	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
qfileinfo.pro	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-06-10 23:27:10 +02:00
qfileinfo.qrc	Moving relevant tests to corelib/io	2011-08-31 10:08:38 +02:00
testdata.qrc	Use qrc for test data in QFileInfo test on all platforms	2015-02-18 12:09:16 +00:00
tst_qfileinfo.cpp	Remove the traces of the discontinued android-no-sdk platform	2016-03-30 10:12:34 +00:00