Conflicts: tests/auto/corelib/io/qfile/tst_qfile.cpp tests/auto/corelib/io/qprocess/tst_qprocess.cpp tests/auto/corelib/tools/qversionnumber/qversionnumber.pro Change-Id: Ia93ce500349d96a2fbf0b4a37b73f088cc505c6e |
||
|---|---|---|
| .. | ||
| arch | ||
| common | ||
| mac/corewlan | ||
| qpa | ||
| unix | ||
| win/directwrite | ||
| x11 | ||
| .gitignore | ||
| .qmake.conf | ||