aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorChristian Kandeler <christian.kandeler@qt.io>2018-01-30 09:59:15 +0100
committerChristian Kandeler <christian.kandeler@qt.io>2018-01-30 10:55:55 +0000
commit96080962285a0bea25ba750be474e851b811c70b (patch)
tree40c32799f724fe89fbfc1ca81085683611651294 /src
parent8355ba92901715bc9366c9a0218fa756ae457408 (diff)
qbs build: Make the Qt bundling functionality configurable
We don't want that in Qt Creator. Change-Id: I811eed24fae6cb3f652a89d37138d8cf00992057 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'src')
-rw-r--r--src/shared/bundledqt/bundledqt.qbs3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/shared/bundledqt/bundledqt.qbs b/src/shared/bundledqt/bundledqt.qbs
index 65d85ffc6..b1594dee7 100644
--- a/src/shared/bundledqt/bundledqt.qbs
+++ b/src/shared/bundledqt/bundledqt.qbs
@@ -6,7 +6,8 @@ Product {
Depends { name: "Qt"; submodules:
["core", "gui", "network", "printsupport", "script", "widgets", "xml"] }
- property bool deployQt: qbs.targetOS.contains("macos") && Qt.core.qtConfig.contains("rpath")
+ property bool deployQt: qbsbuildconfig.enableBundledQt && qbs.targetOS.contains("macos")
+ && Qt.core.qtConfig.contains("rpath")
property bool deployDebugLibraries: qbs.buildVariants.contains("debug")
readonly property string qtDebugLibrarySuffix: {