diff options
author | Jake Petroules <jake.petroules@petroules.com> | 2013-12-04 17:33:31 -0500 |
---|---|---|
committer | Jake Petroules <jake.petroules@petroules.com> | 2013-12-09 12:44:07 +0100 |
commit | 05d835e6d265c0cae63164ba351429264543fb9b (patch) | |
tree | 97cd3f89fa3b1d14b1a10123b96b4e5c5e225747 | |
parent | 0d97f0b4923179c7ac1af148c57779a7ad9ed055 (diff) |
iOS: exclude non-applicable functionality from Simulator builds.
Change-Id: I4c66d3f8bc6f70f2cd517800323d23bf215af4ce
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
-rw-r--r-- | share/qbs/modules/cpp/DarwinGCC.qbs | 3 | ||||
-rw-r--r-- | share/qbs/modules/cpp/ios-gcc.qbs | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/share/qbs/modules/cpp/DarwinGCC.qbs b/share/qbs/modules/cpp/DarwinGCC.qbs index 73c74bd13..651d44c84 100644 --- a/share/qbs/modules/cpp/DarwinGCC.qbs +++ b/share/qbs/modules/cpp/DarwinGCC.qbs @@ -70,7 +70,8 @@ UnixGCC { // architectures supported, to support iPhone 3G for example one has to add // armv6 to the list and also compile for it (with Xcode 4.4.1 or earlier) - dict["UIRequiredDeviceCapabilities"] = [ "armv7" ]; + if (!qbs.targetOS.contains("ios-simulator")) + dict["UIRequiredDeviceCapabilities"] = [ "armv7" ]; var orientations = [ "UIInterfaceOrientationPortrait", diff --git a/share/qbs/modules/cpp/ios-gcc.qbs b/share/qbs/modules/cpp/ios-gcc.qbs index 2ea1adcd9..ca69eddb8 100644 --- a/share/qbs/modules/cpp/ios-gcc.qbs +++ b/share/qbs/modules/cpp/ios-gcc.qbs @@ -20,6 +20,7 @@ DarwinGCC { linkerFlags: base.concat(["-dead_strip", "-headerpad_max_install_names"]) Rule { + condition: !qbs.targetOS.contains("ios-simulator") multiplex: true inputs: ["qbs"] |