diff options
| author | Jake Petroules <jake.petroules@qt.io> | 2017-07-05 15:46:10 -0700 |
|---|---|---|
| committer | Jake Petroules <jake.petroules@qt.io> | 2017-07-07 17:28:33 +0000 |
| commit | b80d5c1c95f44991c12cf997dfe5c09b442a6af2 (patch) | |
| tree | af99c0a7acbd480da8515066036565d151d27768 | |
| parent | f51d7a2314fc7174f02cda2b448931fa5eb6721d (diff) | |
| download | qt-creator-b80d5c1c95f44991c12cf997dfe5c09b442a6af2.tar.gz | |
Qbs: fix bundle installation with Qbs 1.8
This patch also sets the minimumQbsVersion to 1.7 because that's the version
that is actually documented as being required in the README.
Change-Id: I862daaf5fa34ab2cc5db47581689e08aa34f0910
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
| -rw-r--r-- | qbs/imports/QtcProduct.qbs | 2 | ||||
| -rw-r--r-- | qtcreator.qbs | 2 | ||||
| -rw-r--r-- | src/app/app.qbs | 11 |
3 files changed, 6 insertions, 9 deletions
diff --git a/qbs/imports/QtcProduct.qbs b/qbs/imports/QtcProduct.qbs index 52e63f1f6f..65c792ac5c 100644 --- a/qbs/imports/QtcProduct.qbs +++ b/qbs/imports/QtcProduct.qbs @@ -8,6 +8,7 @@ Product { version: qtc.qtcreator_version property bool install: true property string installDir + property string installSourceBase property stringList installTags: type property string fileName: FileInfo.fileName(sourceDirectory) + ".qbs" property bool useNonGuiPchFile: false @@ -37,6 +38,7 @@ Product { fileTagsFilter: installTags qbs.install: install qbs.installDir: installDir + qbs.installSourceBase: installSourceBase } Group { diff --git a/qtcreator.qbs b/qtcreator.qbs index f28ba82a1a..d93ca3bdeb 100644 --- a/qtcreator.qbs +++ b/qtcreator.qbs @@ -4,7 +4,7 @@ import qbs.FileInfo Project { name: "Qt Creator" - minimumQbsVersion: "1.6.0" + minimumQbsVersion: "1.7.0" property bool withAutotests: qbs.buildVariant === "debug" property path ide_source_tree: path property pathList additionalPlugins: [] diff --git a/src/app/app.qbs b/src/app/app.qbs index 2eac52ac64..0af41ca20d 100644 --- a/src/app/app.qbs +++ b/src/app/app.qbs @@ -20,7 +20,9 @@ QtcProduct { targetName: qtc.ide_app_target version: qtc.qtcreator_version - installDir: qtc.ide_bin_path + installDir: bundle.isBundle ? qtc.ide_app_path : qtc.ide_bin_path + installTags: bundle.isBundle ? ["bundle.content"] : base + installSourceBase: bundle.isBundle ? buildDirectory : base property bool qtcRunnable: true cpp.rpaths: qbs.targetOS.contains("macos") ? ["@executable_path/../Frameworks"] @@ -72,11 +74,4 @@ QtcProduct { "../shared/qtlockedfile/qtlockedfile_win.cpp" ] } - - Group { - condition: qbs.targetOS.contains("macos") - fileTagsFilter: ["aggregate_infoplist", "pkginfo", "compiled_assetcatalog"] - qbs.install: true - qbs.installSourceBase: product.buildDirectory - } } |