From 8b8a32ba0ec372e84c189228fde2b1a8d204f6f4 Mon Sep 17 00:00:00 2001 From: Christian Kandeler Date: Wed, 2 Aug 2017 10:03:31 +0200 Subject: qbs build: Do not access the bundle module unconditionally We should not rely on its presence on non-Darwin platforms. Change-Id: I3fa722038f9c2d1139f6e1dc8c49d1c4d2fe0bee Reviewed-by: Joerg Bornemann --- src/app/app.qbs | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'src/app') diff --git a/src/app/app.qbs b/src/app/app.qbs index b67ff28a2c..d0c2885c46 100644 --- a/src/app/app.qbs +++ b/src/app/app.qbs @@ -20,9 +20,10 @@ QtcProduct { targetName: qtc.ide_app_target version: qtc.qtcreator_version - installDir: bundle.isBundle ? qtc.ide_app_path : qtc.ide_bin_path - installTags: bundle.isBundle ? ["bundle.content"] : base - installSourceBase: bundle.isBundle ? buildDirectory : base + property bool isBundle: qbs.targetOS.contains("darwin") && bundle.isBundle + installDir: isBundle ? qtc.ide_app_path : qtc.ide_bin_path + installTags: isBundle ? ["bundle.content"] : base + installSourceBase: isBundle ? buildDirectory : base property bool qtcRunnable: true cpp.rpaths: qbs.targetOS.contains("macos") ? ["@executable_path/../Frameworks"] -- cgit v1.2.3