Liang Qi 9d67bf6e96 Merge remote-tracking branch 'origin/5.12' into 5.13 ... Conflicts: src/corelib/tools/qlocale.qdoc tests/auto/corelib/io/qfileinfo/tst_qfileinfo.cpp Done-with: Edward Welbourne <edward.welbourne@qt.io> Done-with: Volker Hilsheimer <volker.hilsheimer@qt.io> Change-Id: I88e0757b2d020f0a244714c87844631df4b3fd13		2019-04-16 09:34:50 +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	Remove remains of wince in .pro files	2017-07-03 05:32:51 +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.12' into 5.13	2019-04-16 09:34:50 +02:00