Liang Qi 6b8f422c5e Merge remote-tracking branch 'origin/5.6' into 5.7 ... Conflicts: src/corelib/global/qglobal.cpp src/corelib/io/qsettings.cpp src/corelib/itemmodels/qstringlistmodel.cpp tests/auto/gui/image/qimagewriter/tst_qimagewriter.cpp Change-Id: I1c6c306ef42c3c0234b19907914b19da706b4a03		2016-08-13 01:05:02 +02:00
..
resources	…
stdinprocess	Updated license headers	2016-01-21 18:55:18 +00:00
test	Tests: Remove CONFIG += parallel_test.	2015-09-05 07:16:50 +00:00
.gitattributes	…
.gitignore	…
BLACKLIST	Blacklist failing tst_QFile tests (OS X)	2016-01-06 09:38:55 +00:00
copy-fallback.qrc	…
dosfile.txt	…
forCopying.txt	…
forRenaming.txt	…
noendofline.txt	…
qfile.pro	Tests: Remove CONFIG += parallel_test.	2015-09-05 07:16:50 +00:00
qfile.qrc	…
rename-fallback.qrc	…
testfile.txt	…
testlog.txt	…
tst_qfile.cpp	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-08-13 01:05:02 +02:00
two.dots.file	…