diff options
| author | Tor Arne Vestbø <tor.arne.vestbo@digia.com> | 2013-09-11 15:23:03 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-12 12:29:33 +0200 |
| commit | 7c1bbde476b39841549eb87331d97fe0b76e0178 (patch) | |
| tree | 6ed1eff021848eced531f6025309ae78e87bc140 /mkspecs | |
| parent | 3865e473f26d97894d00a4f86025c3c34eb8e266 (diff) | |
Move iOS makespec out of unsupported directory
It's a supported platform from 5.2, and we want build-scripts/CI/etc to
adapt to the change as soon as possible.
Change-Id: I8c78351191f59a6ecab33acc0829d2535379c787
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com>
Reviewed-by: Simo Fält <simo.falt@digia.com>
Diffstat (limited to 'mkspecs')
| -rwxr-xr-x | mkspecs/macx-ios-clang/Info.plist.app (renamed from mkspecs/unsupported/macx-ios-clang/Info.plist.app) | 0 | ||||
| -rw-r--r-- | mkspecs/macx-ios-clang/Info.plist.lib (renamed from mkspecs/unsupported/macx-ios-clang/Info.plist.lib) | 0 | ||||
| -rw-r--r-- | mkspecs/macx-ios-clang/qmake.conf (renamed from mkspecs/unsupported/macx-ios-clang/qmake.conf) | 12 | ||||
| -rw-r--r-- | mkspecs/macx-ios-clang/qplatformdefs.h (renamed from mkspecs/unsupported/macx-ios-clang/qplatformdefs.h) | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/mkspecs/unsupported/macx-ios-clang/Info.plist.app b/mkspecs/macx-ios-clang/Info.plist.app index 91f4b3d07e..91f4b3d07e 100755 --- a/mkspecs/unsupported/macx-ios-clang/Info.plist.app +++ b/mkspecs/macx-ios-clang/Info.plist.app diff --git a/mkspecs/unsupported/macx-ios-clang/Info.plist.lib b/mkspecs/macx-ios-clang/Info.plist.lib index 63f1a945c2..63f1a945c2 100644 --- a/mkspecs/unsupported/macx-ios-clang/Info.plist.lib +++ b/mkspecs/macx-ios-clang/Info.plist.lib diff --git a/mkspecs/unsupported/macx-ios-clang/qmake.conf b/mkspecs/macx-ios-clang/qmake.conf index 3dc2715a5f..ebc07a3d5a 100644 --- a/mkspecs/unsupported/macx-ios-clang/qmake.conf +++ b/mkspecs/macx-ios-clang/qmake.conf @@ -15,11 +15,11 @@ DEFINES += DARWIN_NO_CARBON QT_NO_CORESERVICES QT_NO_PRINTER QT_N # Universal target (iPhone and iPad) QMAKE_IOS_TARGETED_DEVICE_FAMILY = 1,2 -include(../../common/ios.conf) -include(../../common/gcc-base-mac.conf) -include(../../common/clang.conf) -include(../../common/clang-mac.conf) -include(../../common/ios/clang.conf) -include(../../common/ios/qmake.conf) +include(../common/ios.conf) +include(../common/gcc-base-mac.conf) +include(../common/clang.conf) +include(../common/clang-mac.conf) +include(../common/ios/clang.conf) +include(../common/ios/qmake.conf) load(qt_config) diff --git a/mkspecs/unsupported/macx-ios-clang/qplatformdefs.h b/mkspecs/macx-ios-clang/qplatformdefs.h index 581ad0d485..c01b619f9a 100644 --- a/mkspecs/unsupported/macx-ios-clang/qplatformdefs.h +++ b/mkspecs/macx-ios-clang/qplatformdefs.h @@ -39,4 +39,4 @@ ** ****************************************************************************/ -#include "../../common/mac/qplatformdefs.h" +#include "../common/mac/qplatformdefs.h" |