Conflicts: configure src/3rdparty/double-conversion/include/double-conversion/utils.h src/corelib/global/qnamespace.qdoc src/corelib/tools/qsimd_p.h tests/auto/corelib/io/qfile/tst_qfile.cpp Change-Id: I3ca1007bab5355d251c13002a18e93d81c254d34 |
||
|---|---|---|
| .. | ||
| 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 | ||