diff options
author | Jake Petroules <jake.petroules@petroules.com> | 2013-06-05 16:46:12 -0400 |
---|---|---|
committer | Joerg Bornemann <joerg.bornemann@digia.com> | 2013-06-18 10:52:11 +0200 |
commit | f20c3e06bf517a6e23d20afddd0ba36bfd611244 (patch) | |
tree | 232280ae31b609e6d1369fd37ec1414285770da4 /share/qbs/modules/cpp/DarwinGCC.qbs | |
parent | a213f293f525759342d5e73d497858d728168bae (diff) |
Change targetOS and hostOS to lists, and remove targetPlatform.
Change-Id: I33317c857a319e0fa25c9e0d0cc69abc4ad3fabb
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Diffstat (limited to 'share/qbs/modules/cpp/DarwinGCC.qbs')
-rw-r--r-- | share/qbs/modules/cpp/DarwinGCC.qbs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/share/qbs/modules/cpp/DarwinGCC.qbs b/share/qbs/modules/cpp/DarwinGCC.qbs index 9c6fd53c4..5fd6213ce 100644 --- a/share/qbs/modules/cpp/DarwinGCC.qbs +++ b/share/qbs/modules/cpp/DarwinGCC.qbs @@ -58,10 +58,10 @@ UnixGCC { if (product.type.indexOf("applicationbundle") !== -1) dict["CFBundleIconFile"] = product.targetName; - if (qbs.targetOS === "osx" && minimumOsxVersion) + if (qbs.targetOS.contains("osx") && minimumOsxVersion) dict["LSMinimumSystemVersion"] = minimumOsxVersion; - if (qbs.targetOS === "ios") { + if (qbs.targetOS.contains("ios")) { dict["LSRequiresIPhoneOS"] = true; // architectures supported, to support iPhone 3G for example one has to add @@ -177,7 +177,7 @@ UnixGCC { aggregatePlist[key] = props[key]; } - if (product.moduleProperty("qbs", "targetOS") === "ios") { + if (product.moduleProperty("qbs", "targetOS").contains("ios")) { key = "UIDeviceFamily"; if (key in platformInfo && !(key in aggregatePlist)) aggregatePlist[key] = platformInfo[key]; @@ -237,7 +237,7 @@ UnixGCC { // Convert the written file to the format appropriate for the current platform process = new Process(); process.start("plutil", ["-convert", - product.moduleProperty("qbs", "targetOS") === "ios" + product.moduleProperty("qbs", "targetOS").contains("ios") ? "binary1" : "xml1", outputs.infoplist[0].fileName]); process.waitForFinished(); |