feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Qbs: fix bundle installation with Qbs 1.8

Browse Source 
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>
This commit is contained in:
Jake Petroules
2017-07-05 15:46:10 -07:00
parent f51d7a2314
commit b80d5c1c95
3 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
qbs/imports/QtcProduct.qbs
View File

@@ -8,6 +8,7 @@ Product {
version: qtc.qtcreator_version version: qtc.qtcreator_version
property bool install: true property bool install: true
property string installDir property string installDir
property string installSourceBase
property stringList installTags: type property stringList installTags: type
property string fileName: FileInfo.fileName(sourceDirectory) + ".qbs" property string fileName: FileInfo.fileName(sourceDirectory) + ".qbs"
property bool useNonGuiPchFile: false property bool useNonGuiPchFile: false
@@ -37,6 +38,7 @@ Product {
fileTagsFilter: installTags fileTagsFilter: installTags
qbs.install: install qbs.install: install
qbs.installDir: installDir qbs.installDir: installDir
qbs.installSourceBase: installSourceBase
} }
Group { Group {

2
qtcreator.qbs
View File

@@ -4,7 +4,7 @@ import qbs.FileInfo
Project { Project {
name: "Qt Creator" name: "Qt Creator"
minimumQbsVersion: "1.6.0" minimumQbsVersion: "1.7.0"
property bool withAutotests: qbs.buildVariant === "debug" property bool withAutotests: qbs.buildVariant === "debug"
property path ide_source_tree: path property path ide_source_tree: path
property pathList additionalPlugins: [] property pathList additionalPlugins: []

11
src/app/app.qbs
View File

@@ -20,7 +20,9 @@ QtcProduct {
targetName: qtc.ide_app_target targetName: qtc.ide_app_target
version: qtc.qtcreator_version 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 property bool qtcRunnable: true
cpp.rpaths: qbs.targetOS.contains("macos") ? ["@executable_path/../Frameworks"] cpp.rpaths: qbs.targetOS.contains("macos") ? ["@executable_path/../Frameworks"]
@@ -72,11 +74,4 @@ QtcProduct {
"../shared/qtlockedfile/qtlockedfile_win.cpp" "../shared/qtlockedfile/qtlockedfile_win.cpp"
] ]
} }
Group {
condition: qbs.targetOS.contains("macos")
fileTagsFilter: ["aggregate_infoplist", "pkginfo", "compiled_assetcatalog"]
qbs.install: true
qbs.installSourceBase: product.buildDirectory
}
} }