6b8f422c5e
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 |
||
---|---|---|
.. | ||
resources | ||
stdinprocess | ||
test | ||
.gitattributes | ||
.gitignore | ||
BLACKLIST | ||
copy-fallback.qrc | ||
dosfile.txt | ||
forCopying.txt | ||
forRenaming.txt | ||
noendofline.txt | ||
qfile.pro | ||
qfile.qrc | ||
rename-fallback.qrc | ||
testfile.txt | ||
testlog.txt | ||
tst_qfile.cpp | ||
two.dots.file |