summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoerg Bornemann <joerg.bornemann@digia.com>2013-07-12 14:57:50 +0200
committerChristian Kandeler <christian.kandeler@digia.com>2013-07-12 15:47:37 +0200
commit6762c79080f2711b7e70b1d005228406e94f9c6c (patch)
tree032e68c01285903fa11c9588a04abfaa9eb6dbd9
parentb3abe3ef3c37c25548f46a81ac2a3b24f36dba53 (diff)
downloadqbs-6762c79080f2711b7e70b1d005228406e94f9c6c.tar.gz
don't link frameworks transitively
Change-Id: I00443f33331e851838304f12aea7644b352839c8 Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
-rw-r--r--share/qbs/modules/cpp/gcc.js4
1 files changed, 2 insertions, 2 deletions
diff --git a/share/qbs/modules/cpp/gcc.js b/share/qbs/modules/cpp/gcc.js
index 3e55f6b0a..cf2caffed 100644
--- a/share/qbs/modules/cpp/gcc.js
+++ b/share/qbs/modules/cpp/gcc.js
@@ -5,8 +5,8 @@ function libraryLinkerFlags(product, inputs)
var staticLibraries = ModUtils.modulePropertiesFromArtifacts(product, inputs.staticlibrary, 'cpp', 'staticLibraries');
var frameworkPaths = ModUtils.moduleProperties(product, 'frameworkPaths');
var systemFrameworkPaths = ModUtils.moduleProperties(product, 'systemFrameworkPaths');
- var frameworks = ModUtils.modulePropertiesFromArtifacts(product, inputs.dynamiclibrary, 'cpp', 'frameworks');
- var weakFrameworks = ModUtils.modulePropertiesFromArtifacts(product, inputs.dynamiclibrary, 'cpp', 'weakFrameworks');
+ var frameworks = ModUtils.moduleProperties(product, 'frameworks');
+ var weakFrameworks = ModUtils.moduleProperties(product, 'weakFrameworks');
var rpaths = ModUtils.moduleProperties(product, 'rpaths');
var args = [], i, prefix, suffix;