Conflicts: src/plugins/platforms/ios/quiview.mm Change-Id: I88384c70047391c75d9ff166c8d9881ff6751dbf |
||
|---|---|---|
| .. | ||
| qmake.conf | ||
| qplatformdefs.h | ||
Conflicts: src/plugins/platforms/ios/quiview.mm Change-Id: I88384c70047391c75d9ff166c8d9881ff6751dbf |
||
|---|---|---|
| .. | ||
| qmake.conf | ||
| qplatformdefs.h | ||