diff options
author | Christian Kandeler <christian.kandeler@qt.io> | 2017-08-01 18:10:36 +0200 |
---|---|---|
committer | Christian Kandeler <christian.kandeler@qt.io> | 2017-08-02 08:06:09 +0000 |
commit | 1eff54864642c459263de9653e26d9f56af04ce9 (patch) | |
tree | 7dce149858243c62fcb325b2bffba58536a970f4 /qbs-resources | |
parent | de5db8cfb87f7c54fddd6d9ecc124cd33201de2a (diff) |
Do not access the bundle module unconditionally
It is a mistake that the NativeBinary item currently pulls in the bundle
module unconditionally (and also that the module is enabled everywhere).
We want to change that. Prepare for the change by removing all
unconditional accesses to the module's properties.
Change-Id: If57b8222c1a0e2b09c33520882446fa71401f1f1
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'qbs-resources')
-rw-r--r-- | qbs-resources/imports/QbsLibrary.qbs | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/qbs-resources/imports/QbsLibrary.qbs b/qbs-resources/imports/QbsLibrary.qbs index b459b4c8c..3b884ed5d 100644 --- a/qbs-resources/imports/QbsLibrary.qbs +++ b/qbs-resources/imports/QbsLibrary.qbs @@ -2,7 +2,6 @@ import qbs QbsProduct { Depends { name: "cpp" } - Depends { name: "bundle" } version: qbsversion.version type: Qt.core.staticBuild ? "staticlibrary" : "dynamiclibrary" targetName: (qbs.enableDebugCode && qbs.targetOS.contains("windows")) ? (name + 'd') : name @@ -13,7 +12,6 @@ QbsProduct { //cpp.soVersion: version.replace(/\.\d+$/, '') cpp.visibility: "minimal" cpp.cxxLanguageVersion: "c++11" - bundle.isBundle: false property bool visibilityType: Qt.core.staticBuild ? "static" : "dynamic" property string headerInstallPrefix: "/include/qbs" Group { @@ -27,6 +25,11 @@ QbsProduct { qbs.installDir: qbsbuildconfig.importLibInstallDir } + Properties { + condition: qbs.targetOS.contains("darwin") + bundle.isBundle: false + } + Export { Depends { name: "cpp" } Depends { name: "Qt"; submodules: ["core"] } |