diff options
| author | Eike Ziller <eike.ziller@digia.com> | 2013-06-25 10:14:14 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@digia.com> | 2013-06-25 10:14:14 +0200 |
| commit | e8469a2babd0553fe1343b91cd904e459d89a2be (patch) | |
| tree | cd686e7d27e496fe1373b9f1b87ab02058503707 /qtcreator.qbs | |
| parent | 72b06779abb99fda119a73990e25632387a7a072 (diff) | |
| parent | c59ba462adff332fee2cb333cbb9a87972288011 (diff) | |
| download | qt-creator-e8469a2babd0553fe1343b91cd904e459d89a2be.tar.gz | |
Merge remote-tracking branch 'origin/2.8'
Conflicts:
src/plugins/fakevim/fakevimhandler.cpp
Change-Id: I8101f18b87859924644471817d4f1408790d5628
Diffstat (limited to 'qtcreator.qbs')
| -rw-r--r-- | qtcreator.qbs | 40 |
1 files changed, 22 insertions, 18 deletions
diff --git a/qtcreator.qbs b/qtcreator.qbs index 16c1558ffc..68d390b778 100644 --- a/qtcreator.qbs +++ b/qtcreator.qbs @@ -8,32 +8,36 @@ Project { property string ide_version_minor: '8' 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_app_path: qbs.targetOS.contains("mac") ? "" : "bin" + property string ide_app_target: qbs.targetOS.contains("mac") ? "Qt Creator" : "qtcreator" property string ide_library_path: { - if (qbs.targetOS == "mac") + if (qbs.targetOS.contains("mac")) return ide_app_target + ".app/Contents/PlugIns" - else if (qbs.targetOS == "windows") + else if (qbs.targetOS.contains("windows")) return ide_app_path else return "lib/qtcreator" } property string ide_plugin_path: { - if (qbs.targetOS == "mac") + if (qbs.targetOS.contains("mac")) return ide_library_path - else if (qbs.targetOS == "windows") + else if (qbs.targetOS.contains("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 + property string ide_data_path: qbs.targetOS.contains("mac") + ? ide_app_target + ".app/Contents/Resources" + : "share/qtcreator" + property string ide_libexec_path: qbs.targetOS.contains("mac") + ? ide_data_path + : ide_app_path + property string ide_doc_path: qbs.targetOS.contains("mac") + ? ide_data_path + "/doc" + : "share/doc/qtcreator" + property string ide_bin_path: qbs.targetOS.contains("mac") + ? ide_app_target + ".app/Contents/MacOS" + : ide_app_path moduleSearchPaths: "qbs" references: [ @@ -170,7 +174,7 @@ Project { name: project.ide_app_target consoleApplication: qbs.debugInformation - cpp.rpaths: qbs.targetOS == "mac" ? ["@executable_path/.."] + cpp.rpaths: qbs.targetOS.contains("mac") ? ["@executable_path/.."] : ["$ORIGIN/../lib/qtcreator"] cpp.defines: Defaults.defines(qbs) cpp.linkerFlags: { @@ -205,7 +209,7 @@ Project { Group { name: "qtcreator.sh" - condition: qbs.targetPlatform.indexOf("unix") != -1 && qbs.targetOS != "mac" + condition: qbs.targetOS.contains("unix") && !qbs.targetOS.contains("mac") files: "bin/qtcreator.sh" qbs.install: true qbs.installDir: "bin" @@ -213,7 +217,7 @@ Project { Group { name: "QtLockedFile_unix" - condition: qbs.targetPlatform.indexOf("unix") != -1 + condition: qbs.targetOS.contains("unix") files: [ "src/shared/qtlockedfile/qtlockedfile_unix.cpp" ] @@ -221,7 +225,7 @@ Project { Group { name: "QtLockedFile_win" - condition: qbs.targetOS == "windows" + condition: qbs.targetOS.contains("windows") files: [ "src/shared/qtlockedfile/qtlockedfile_win.cpp" ] |