From e57b5a468788f037e278d0ddaaf02c10cbb252d9 Mon Sep 17 00:00:00 2001 From: Jake Petroules Date: Tue, 9 May 2017 17:06:11 -0700 Subject: Don't add compiler defines to the Info.plist replacement variable list This was not implemented correctly (Xcode substitutes environment variables using this syntax, not compiler defines) and not documented anyways. Further, qbs has better functions for dealing with this. Change-Id: I26c51457c059feddea42de2b13969a842be89696 Reviewed-by: Christian Kandeler --- share/qbs/modules/bundle/BundleModule.qbs | 9 --------- 1 file changed, 9 deletions(-) (limited to 'share/qbs/modules/bundle/BundleModule.qbs') diff --git a/share/qbs/modules/bundle/BundleModule.qbs b/share/qbs/modules/bundle/BundleModule.qbs index 0a0ecc6e3..a7332a4ea 100644 --- a/share/qbs/modules/bundle/BundleModule.qbs +++ b/share/qbs/modules/bundle/BundleModule.qbs @@ -289,10 +289,6 @@ Module { cmd.qmakeEnv = ModUtils.moduleProperty(product, "qmakeEnv"); cmd.buildEnv = product.moduleProperty("cpp", "buildEnv"); - cmd.defines = product.moduleProperty("cpp", "defines"); - cmd.platformDefines = product.moduleProperty("cpp", "platformDefines"); - cmd.compilerDefines = product.moduleProperty("cpp", "compilerDefines"); - cmd.allDefines = [].concat(cmd.defines || []).concat(cmd.platformDefines || []).concat(cmd.compilerDefines || []); cmd.developerPath = product.moduleProperty("xcode", "developerPath"); cmd.platformInfoPlist = product.moduleProperty("xcode", "platformInfoPlist"); @@ -395,11 +391,6 @@ Module { for (key in qmakeEnv) env[key] = qmakeEnv[key]; - for (i = 0; i < allDefines.length; ++i) { - var parts = allDefines[i].split('='); - env[parts[0]] = parts[1]; - } - DarwinTools.expandPlistEnvironmentVariables(aggregatePlist, env, true); // Add keys from partial Info.plists from asset catalogs, XIBs, and storyboards -- cgit v1.2.3