Conflicts: mkspecs/features/moc.prf Change-Id: Ia71c8e3b3185f7c999bf226d0675051b10b8740b |
||
|---|---|---|
| .. | ||
| Info.plist.app | ||
| Info.plist.dSYM.in | ||
| Info.plist.lib | ||
| qmake.conf | ||
| qplatformdefs.h | ||
Conflicts: mkspecs/features/moc.prf Change-Id: Ia71c8e3b3185f7c999bf226d0675051b10b8740b |
||
|---|---|---|
| .. | ||
| Info.plist.app | ||
| Info.plist.dSYM.in | ||
| Info.plist.lib | ||
| qmake.conf | ||
| qplatformdefs.h | ||