Conflicts: mkspecs/features/moc.prf Change-Id: Ia71c8e3b3185f7c999bf226d0675051b10b8740b |
||
|---|---|---|
| .. | ||
| entrylist | ||
| resources/entryList | ||
| searchdir | ||
| testData | ||
| testdir | ||
| types | ||
| .gitignore | ||
| android_testdata.qrc | ||
| qdir.pro | ||
| qdir.qrc | ||
| tst_qdir.cpp | ||
Conflicts: mkspecs/features/moc.prf Change-Id: Ia71c8e3b3185f7c999bf226d0675051b10b8740b |
||
|---|---|---|
| .. | ||
| entrylist | ||
| resources/entryList | ||
| searchdir | ||
| testData | ||
| testdir | ||
| types | ||
| .gitignore | ||
| android_testdata.qrc | ||
| qdir.pro | ||
| qdir.qrc | ||
| tst_qdir.cpp | ||