From 044c8607320e1dfcf0b984721334906a475f8415 Mon Sep 17 00:00:00 2001 From: Jake Petroules Date: Thu, 24 Mar 2016 17:27:03 -0700 Subject: Introduce Array.containsAll and Array.containsAny. Use where appropriate. Change-Id: Iaade46eab682e32d490dc718ec637930f4611c6c Reviewed-by: Christian Kandeler --- share/qbs/modules/bundle/BundleModule.qbs | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'share/qbs/modules/bundle') diff --git a/share/qbs/modules/bundle/BundleModule.qbs b/share/qbs/modules/bundle/BundleModule.qbs index ff0b67441..08c473356 100644 --- a/share/qbs/modules/bundle/BundleModule.qbs +++ b/share/qbs/modules/bundle/BundleModule.qbs @@ -81,11 +81,9 @@ Module { additionalProductTypes: ["bundle"] - property bool isBundle: qbs.targetOS.contains("darwin") - && (product.type.contains("application") - || product.type.contains("dynamiclibrary") - || product.type.contains("loadablemodule")) - && !product.consoleApplication + property bool isBundle: !product.consoleApplication && qbs.targetOS.contains("darwin") && + product.type.containsAny(["application", "dynamiclibrary", "loadablemodule"]) + readonly property bool isShallow: bundleSettingsProbe.xcodeSettings["SHALLOW_BUNDLE"] === "YES" property string identifierPrefix: "org.example" @@ -100,7 +98,7 @@ Module { return "XPC!"; if (product.type.contains("application")) return "APPL"; - if (product.type.contains("dynamiclibrary") || product.type.contains("staticlibrary")) + if (product.type.containsAny(["dynamiclibrary", "staticlibrary"])) return "FMWK"; if (product.type.contains("kernelmodule")) return "KEXT"; -- cgit v1.2.3