diff options
author | Jake Petroules <jake.petroules@qt.io> | 2017-05-09 17:06:11 -0700 |
---|---|---|
committer | Jake Petroules <jake.petroules@qt.io> | 2017-05-10 16:28:57 +0000 |
commit | e57b5a468788f037e278d0ddaaf02c10cbb252d9 (patch) | |
tree | 459327926fac31fe993f5ef99208f2ed180f8cc7 /share/qbs/modules/bundle/BundleModule.qbs | |
parent | 613c38030af77becf489e04ea0d6d99df8ba59f4 (diff) |
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 <christian.kandeler@qt.io>
Diffstat (limited to 'share/qbs/modules/bundle/BundleModule.qbs')
-rw-r--r-- | share/qbs/modules/bundle/BundleModule.qbs | 9 |
1 files changed, 0 insertions, 9 deletions
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 |