aboutsummaryrefslogtreecommitdiffstats
path: root/share/qbs/modules/bundle/BundleModule.qbs
diff options
context:
space:
mode:
authorChristian Kandeler <christian.kandeler@theqtcompany.com>2016-04-14 09:59:21 +0200
committerChristian Kandeler <christian.kandeler@theqtcompany.com>2016-04-14 09:38:21 +0000
commita48d3e9d28274a9f3e6ce8415c3344ba01acc51a (patch)
tree8861469045b059fb00234ab529a0006206ec3988 /share/qbs/modules/bundle/BundleModule.qbs
parent4e442c034dcfee45c24a12d289894dbce09fdbc6 (diff)
Fix performance regression in bundle module for non-Darwin targets.
The Probe and the validate script only need to be run for the platforms that actually support bundles. Change-Id: Ib56eb28c8b036d52d97c85345547060bb470d67b Reviewed-by: Jake Petroules <jake.petroules@theqtcompany.com>
Diffstat (limited to 'share/qbs/modules/bundle/BundleModule.qbs')
-rw-r--r--share/qbs/modules/bundle/BundleModule.qbs5
1 files changed, 5 insertions, 0 deletions
diff --git a/share/qbs/modules/bundle/BundleModule.qbs b/share/qbs/modules/bundle/BundleModule.qbs
index 6f45b07ed..ab66d8d79 100644
--- a/share/qbs/modules/bundle/BundleModule.qbs
+++ b/share/qbs/modules/bundle/BundleModule.qbs
@@ -45,6 +45,7 @@ Module {
Probe {
id: bundleSettingsProbe
+ condition: qbs.targetOS.contains("darwin")
property string xcodeDeveloperPath: xcode.developerPath
@@ -70,6 +71,8 @@ Module {
property var xcodeSettings: ({})
configure: {
+ if (!qbs.targetOS.contains("darwin")) // TODO: Remove when probe conditions are working
+ return;
var specsPath = path;
var specsSeparator = "-";
if (xcodeDeveloperPath && _useXcodeBuildSpecs) {
@@ -214,6 +217,8 @@ Module {
}
validate: {
+ if (!qbs.targetOS.contains("darwin"))
+ return;
if (!bundleSettingsProbe.found) {
var error = "Bundle product type " + _productTypeIdentifier + " is not supported.";
if ((_productTypeIdentifier || "").startsWith("com.apple.product-type."))