17198e03ab
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 |
||
---|---|---|
.. | ||
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 |