From 2a9683dc918b6a560774e5f7fe48e2c122301f53 Mon Sep 17 00:00:00 2001 From: Jake Petroules Date: Fri, 1 Dec 2017 00:20:35 -0800 Subject: Move the Qt library installation out of the archive product This allows Qt to be installed as part of Qbs by default instead of only when the archive package is built. Currently, this is enabled by default only for installations of Qt on macOS which are relocatable (have rpath in QT_CONFIG). This way it will not interfere with package managers like Homebrew/MacPorts which do not use rpath - for example, when building against a version of Qt installed by a package manager (which is typically built with absolute sonames), you're assumed to be building software to be packaged by that package manager, and therefore you want to rely on Qt as a "system" package and not copy it locally. It can also be explicitly switched off on the command line using products.qbsqt.deployQt:false This also refactors the logic a bit. Change-Id: I70b46d8fac08d34520ceab18405fa8a672158711 Reviewed-by: Christian Kandeler --- src/src.qbs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/src.qbs') diff --git a/src/src.qbs b/src/src.qbs index 97c271850..ae58f41ae 100644 --- a/src/src.qbs +++ b/src/src.qbs @@ -7,6 +7,7 @@ Project { "libexec/libexec.qbs", "packages/packages.qbs", "plugins/plugins.qbs", - "shared/json/json.qbs" + "shared/json/json.qbs", + "shared/bundledqt/bundledqt.qbs", ] } -- cgit v1.2.3