summaryrefslogtreecommitdiff
path: root/qtcreator.qbs
diff options
context:
space:
mode:
authorEike Ziller <eike.ziller@digia.com>2013-04-19 16:20:22 +0200
committerEike Ziller <eike.ziller@digia.com>2013-04-22 16:58:09 +0200
commite3fd25256d20d89d199e63c139af1ad43981fb34 (patch)
tree8bea8b2e4a6da01aa13bed4f5ee91a60d6f773e8 /qtcreator.qbs
parentca2c9b5c9c675ea611e02c2976aaf6e8c3848988 (diff)
downloadqt-creator-e3fd25256d20d89d199e63c139af1ad43981fb34.tar.gz
Qbs build files: Install files to correct location
First step in fixing the Mac build Change-Id: I86659b9b46c01fc17fd93b8ffc3b378d2b580c36 Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Diffstat (limited to 'qtcreator.qbs')
-rw-r--r--qtcreator.qbs33
1 files changed, 30 insertions, 3 deletions
diff --git a/qtcreator.qbs b/qtcreator.qbs
index 02b36a2066..ba93b13540 100644
--- a/qtcreator.qbs
+++ b/qtcreator.qbs
@@ -3,10 +3,37 @@ import qbs.fileinfo as FileInfo
import "qbs/defaults.js" as Defaults
Project {
+
property string ide_version_major: '2'
property string ide_version_minor: '7'
property string ide_version_release: '81'
property string qtcreator_version: ide_version_major + '.' + ide_version_minor + '.' + ide_version_release
+ property string ide_app_path: qbs.targetOS == "mac" ? "" : "bin"
+ property string ide_app_target: qbs.targetOS == "mac" ? "Qt Creator" : "qtcreator"
+ property string ide_library_path: {
+ if (qbs.targetOS == "mac")
+ return ide_app_target + ".app/Contents/PlugIns"
+ else if (qbs.targetOS == "windows")
+ return ide_app_path
+ else
+ return "lib/qtcreator"
+ }
+ property string ide_plugin_path: {
+ if (qbs.targetOS == "mac")
+ return ide_library_path
+ else if (qbs.targetOS == "windows")
+ return "lib/qtcreator/plugins"
+ else
+ return ide_library_path + "/plugins"
+ }
+ property string ide_data_path: qbs.targetOS == "mac" ? ide_app_target + ".app/Contents/Resources"
+ : "share/qtcreator"
+ property string ide_libexec_path: qbs.targetOS == "mac" ? ide_data_path
+ : ide_app_path
+ property string ide_doc_path: qbs.targetOS == "mac" ? ide_data_path + "/doc"
+ : "share/doc/qtcreator"
+ property string ide_bin_path: qbs.targetOS == "mac" ? ide_app_target + ".app/Contents/MacOS"
+ : ide_app_path
moduleSearchPaths: "qbs"
references: [
@@ -140,7 +167,7 @@ Project {
}
Application {
- name: "qtcreator"
+ name: project.ide_app_target
consoleApplication: qbs.debugInformation
cpp.rpaths: ["$ORIGIN/../lib/qtcreator"]
@@ -176,7 +203,7 @@ Project {
]
Group {
- condition: qbs.targetPlatform.indexOf("unix") != -1
+ condition: qbs.targetPlatform.indexOf("unix") != -1 && qbs.targetOS != "mac"
files: "bin/qtcreator.sh"
qbs.install: true
qbs.installDir: "bin"
@@ -199,7 +226,7 @@ Project {
Group {
fileTagsFilter: product.type
qbs.install: true
- qbs.installDir: "bin"
+ qbs.installDir: project.ide_app_path
}
}
}