AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
6b8f422c5e
qt5base-lts/tests/auto/corelib/io/qfile
History
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 Moving relevant tests to corelib/io 2011-08-31 10:08:38 +02:00
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 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
BLACKLIST Blacklist failing tst_QFile tests (OS X) 2016-01-06 09:38:55 +00:00
copy-fallback.qrc Moving relevant tests to corelib/io 2011-08-31 10:08:38 +02:00
dosfile.txt Moving relevant tests to corelib/io 2011-08-31 10:08:38 +02:00
forCopying.txt Moving relevant tests to corelib/io 2011-08-31 10:08:38 +02:00
forRenaming.txt Moving relevant tests to corelib/io 2011-08-31 10:08:38 +02:00
noendofline.txt Moving relevant tests to corelib/io 2011-08-31 10:08:38 +02:00
qfile.pro Tests: Remove CONFIG += parallel_test. 2015-09-05 07:16:50 +00:00
qfile.qrc Moving relevant tests to corelib/io 2011-08-31 10:08:38 +02:00
rename-fallback.qrc Moving relevant tests to corelib/io 2011-08-31 10:08:38 +02:00
testfile.txt Moving relevant tests to corelib/io 2011-08-31 10:08:38 +02:00
testlog.txt Moving relevant tests to corelib/io 2011-08-31 10:08:38 +02:00
tst_qfile.cpp Merge remote-tracking branch 'origin/5.6' into 5.7 2016-08-13 01:05:02 +02:00
two.dots.file Moving relevant tests to corelib/io 2011-08-31 10:08:38 +02:00