diff options
author | Tor Arne Vestbø <tor.arne.vestbo@digia.com> | 2013-03-02 15:46:37 +0100 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-03-05 20:59:45 +0100 |
commit | d28073d9eb0f35bae534470970e693a94463c549 (patch) | |
tree | d3331dc068105893fecd93868dd078d1ea57edaf /mkspecs/unsupported | |
parent | 950b35cf97ad398f97883efd2a18ee97994a8a9c (diff) |
Distinguish between 'mac' and 'macx' qmake scopes
The former applies both on Mac OS X and iOS, but 'macx' is specific to
Mac OS X.
ios.conf and macx.conf now share most of their settings in the common
mac.conf. We set the default QMAKE_MAC_SDK before loading mac.conf, so
that any overrides in the device config will apply afterwards. This
means configure's mkspec parsing will be able to read the QMAKE_MAC_SDK.
Change-Id: I0c7e26a6a0103e19b23ef152aa9e4ab461cee632
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com>
Diffstat (limited to 'mkspecs/unsupported')
-rw-r--r-- | mkspecs/unsupported/macx-ios-clang/qmake.conf | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/mkspecs/unsupported/macx-ios-clang/qmake.conf b/mkspecs/unsupported/macx-ios-clang/qmake.conf index 47aeff8139..7805c079bb 100644 --- a/mkspecs/unsupported/macx-ios-clang/qmake.conf +++ b/mkspecs/unsupported/macx-ios-clang/qmake.conf @@ -2,24 +2,26 @@ # qmake configuration for macx-ios-clang # -!load(device_config): error("Could not successfully load device configuration.") +MAKEFILE_GENERATOR = UNIX +CONFIG += app_bundle reduce_exports incremental global_init_link_order lib_version_first plugin_no_soname sdk +QMAKE_INCREMENTAL_STYLE = sublib -isEmpty(QMAKE_MAC_SDK): QMAKE_MAC_SDK = iphoneos +QMAKE_MACOSX_DEPLOYMENT_TARGET = +QMAKE_IOS_DEPLOYMENT_TARGET = 4.3 -# 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/macx.conf) - -include(../../common/gcc-base-mac.conf) -include(../../common/xcode.conf) -include(../../common/clang.conf) -include(../../common/clang-mac.conf) +INCLUDEPATH += $$PWD/ios +DEFINES += DARWIN_NO_CARBON QT_NO_CORESERVICES QT_NO_PRINTER QT_NO_PRINTDIALOG +# Universal target (iPhone and iPad) +QMAKE_IOS_TARGETED_DEVICE_FAMILY = 1,2 -# Version check +include(../../common/xcode.conf) lessThan(QMAKE_XCODE_VERSION, "4.3"): error("This mkspec requires Xcode 4.3 or later") 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) |