From 96080962285a0bea25ba750be474e851b811c70b Mon Sep 17 00:00:00 2001 From: Christian Kandeler Date: Tue, 30 Jan 2018 09:59:15 +0100 Subject: qbs build: Make the Qt bundling functionality configurable We don't want that in Qt Creator. Change-Id: I811eed24fae6cb3f652a89d37138d8cf00992057 Reviewed-by: Alexandru Croitor --- src/shared/bundledqt/bundledqt.qbs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/shared') 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: { -- cgit v1.2.1