Liang Qi 4dd8a63fc1 Merge remote-tracking branch 'origin/5.5.0' into 5.5 ... Conflicts: src/plugins/platforms/cocoa/qcocoafiledialoghelper.h Manually fixed src/testlib/qtestcase.cpp to return the right type. Change-Id: Id1634dbe3d73fefe9431b9f5378846cb187624e4		2015-06-27 13:54:35 +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	fix usage of wince scope	2015-06-05 10:29:10 +00: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	Merge remote-tracking branch 'origin/5.5.0' into 5.5	2015-06-27 13:54:35 +02:00