diff options
| author | Tor Arne Vestbø <tor.arne.vestbo@digia.com> | 2013-03-02 15:13:38 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-03-05 18:40:03 +0100 |
| commit | 26b260c0c18a50080ac75081b60671e4b1f04438 (patch) | |
| tree | 5836fe754ceda653fca25e116becc7dd692154b4 /mkspecs/unsupported/macx-ios-clang/qmake.conf | |
| parent | 71252ac222246ef7dff728b7957356593c6d7fa2 (diff) | |
Rename common/mac.conf to common/macx.conf
This is a step towards making mac a shared scope for both Mac OS X and
iOS, while macx is Mac OS X specific and ios is iOS specific.
We'll then move iOS to not include macx.conf, once we make the change
to not have iOS imply macx.
Change-Id: Ic9ce4d597873aa3cf2c981598354733e07db644d
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com>
Diffstat (limited to 'mkspecs/unsupported/macx-ios-clang/qmake.conf')
| -rw-r--r-- | mkspecs/unsupported/macx-ios-clang/qmake.conf | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mkspecs/unsupported/macx-ios-clang/qmake.conf b/mkspecs/unsupported/macx-ios-clang/qmake.conf index 3cb68d495a..5213d4e555 100644 --- a/mkspecs/unsupported/macx-ios-clang/qmake.conf +++ b/mkspecs/unsupported/macx-ios-clang/qmake.conf @@ -8,7 +8,7 @@ isEmpty(QMAKE_MAC_SDK): QMAKE_MAC_SDK = iphoneos # iOS is considered a variant of MacOS by Apple. We follow this to # keep things simple, e.g. by defining Q_OS_MAC _and_ Q_OS_IOS. -include(../../common/mac.conf) +include(../../common/macx.conf) include(../../common/gcc-base-ios.conf) include(../../common/xcode.conf) |