diff options
| author | Christian Kandeler <christian.kandeler@qt.io> | 2018-02-02 10:28:49 +0100 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@qt.io> | 2018-02-02 10:35:26 +0100 |
| commit | 7a9642a8369390537b48ffce7e4bfe9f69bea1c1 (patch) | |
| tree | df7f551b11f8137958ccd74e54254a4c4c9859c8 /src/shared | |
| parent | 8b99628dc3bb125366f8b5c99ca57c78b96c1e54 (diff) | |
| parent | 8e396382646a9e1a3efb57bc77e303f90b7c80c0 (diff) | |
| download | qbs-7a9642a8369390537b48ffce7e4bfe9f69bea1c1.tar.gz | |
Merge 1.11 into master
Change-Id: Id4986b2170ac13bf8931656659f6f60432cdbe8d
Diffstat (limited to 'src/shared')
| -rw-r--r-- | src/shared/bundledqt/bundledqt.qbs | 3 |
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: { |