diff options
| author | Christian Kandeler <christian.kandeler@qt.io> | 2017-06-14 15:01:58 +0200 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@qt.io> | 2017-06-14 13:26:44 +0000 |
| commit | bf851f8a42b27d2a1fa9d384be18407ef9344250 (patch) | |
| tree | e6b563c0f5a50958cef40dd9168dc50e32e521c7 /src/plugins | |
| parent | 4a3a382ea2f7ed6f55b0655acbf780f28ba25159 (diff) | |
Fix qbs build
The plugins must not define QBS_LIBRARY.
Change-Id: Ie7fd3b5052bb37b5a25a08fa41a44e4731088761
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'src/plugins')
| -rw-r--r-- | src/plugins/qbsplugin.qbs | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/plugins/qbsplugin.qbs b/src/plugins/qbsplugin.qbs index 44638b7b3..5f97a946a 100644 --- a/src/plugins/qbsplugin.qbs +++ b/src/plugins/qbsplugin.qbs @@ -7,7 +7,10 @@ QbsProduct { Depends { name: "qbsbuildconfig" } Depends { name: "qbscore"; condition: !Qt.core.staticBuild } type: (Qt.core.staticBuild ? ["staticlibrary"] : ["dynamiclibrary"]).concat(["qbsplugin"]) - cpp.defines: base.concat(type.contains("staticlibrary") ? ["QBS_STATIC_LIB"] : ["QBS_LIBRARY"]) + Properties { + condition: Qt.core.staticBuild + cpp.defines: ["QBS_STATIC_LIB"] + } cpp.cxxLanguageVersion: "c++11" cpp.includePaths: base.concat(["../../../lib/corelib"]) cpp.visibility: "hidden" |