qt5base-lts/tests/auto/corelib/io/qfile
Liang Qi 17198e03ab Merge remote-tracking branch 'origin/5.7' into dev
Conflicts:
	qmake/doc/src/qmake-manual.qdoc
	src/corelib/global/qglobal.cpp
	src/corelib/tools/qstring.cpp
	src/network/socket/qabstractsocket.cpp
	src/network/socket/qnativesocketengine_unix.cpp
	src/plugins/platforms/eglfs/api/qeglfsglobal.h

Change-Id: Id5dfdbd30fa996f9b4b66a0b030b7d3b8c0ef288
2016-08-16 07:58:32 +02:00
..
resources
stdinprocess Updated license headers 2016-01-21 18:55:18 +00:00
test QtCore: Remove Windows CE. 2016-03-30 11:22:47 +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 QtCore: Remove Windows CE. 2016-03-30 11:22:47 +00:00
qfile.qrc
rename-fallback.qrc
testfile.txt
testlog.txt
tst_qfile.cpp Merge remote-tracking branch 'origin/5.7' into dev 2016-08-16 07:58:32 +02:00
two.dots.file