diff options
| author | Christian Kandeler <christian.kandeler@qt.io> | 2016-08-26 14:53:58 +0200 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@qt.io> | 2016-10-24 14:57:46 +0000 |
| commit | 465260e5eaaa3108f6cc0ae70191dd8f403906d4 (patch) | |
| tree | 16cc1b683201cf83c43b91eea8b94b6a2e210074 /share | |
| parent | 8720b97e595d5652d00ceea11a3af6d31fd7ba6b (diff) | |
Add module instance as scope to cloned module prototype
... when evaluating the "prototype part" of list properties. This is
necessary so that other properties appearing on the right-hand-side of
the property use the value from the instance instead of the one from the
prototype.
Task-number: QBS-845
Task-number: QBS-966
Change-Id: I7b6c7d068e45f4805422c887239ec81b5c661880
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'share')
| -rw-r--r-- | share/qbs/modules/cpp/gcc.js | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/share/qbs/modules/cpp/gcc.js b/share/qbs/modules/cpp/gcc.js index 641d8e579..23b3eaf37 100644 --- a/share/qbs/modules/cpp/gcc.js +++ b/share/qbs/modules/cpp/gcc.js @@ -112,16 +112,6 @@ function linkerFlags(project, product, inputs, output) { var isDarwin = product.moduleProperty("qbs", "targetOS").contains("darwin"); var i, args = additionalCompilerAndLinkerFlags(product); - // ### QBS-966 - if (product.moduleProperty("qbs", "targetOS").contains("android")) { - var sharedStlFilePath = product.moduleProperty("cpp", "sharedStlFilePath"); - if (sharedStlFilePath) - dynamicLibraries.push(sharedStlFilePath); - var staticStlFilePath = product.moduleProperty("cpp", "staticStlFilePath"); - if (staticStlFilePath) - staticLibraries.push(staticStlFilePath); - } - if (output.fileTags.contains("dynamiclibrary")) { args.push(isDarwin ? "-dynamiclib" : "-shared"); |