Conflicts: src/plugins/platforms/windows/qwindowswindow.cpp tests/auto/widgets/kernel/qaction/tst_qaction.cpp Change-Id: Ia017a825ed2ca2d53ac586f4ae48df6f65818d40 |
||
|---|---|---|
| .. | ||
| 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 | ||