diff options
| author | Joerg Bornemann <joerg.bornemann@digia.com> | 2013-06-25 18:17:15 +0200 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@digia.com> | 2013-06-26 16:46:18 +0200 |
| commit | 5a3c4cc8effbdfd581744bc41216caa6142bc886 (patch) | |
| tree | e1827a78db81b857ce22a3c30c1ec8733fdd11b9 /qtcreator.qbs | |
| parent | ee70e9d2673ab9ae95a3f42985615be52f4e1a07 (diff) | |
qbs files: fix OS X checks
Change-Id: I618c1ad4bf328492403b48c8e398abd538f74787
Reviewed-by: Jake Petroules <jake.petroules@petroules.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
Diffstat (limited to 'qtcreator.qbs')
| -rw-r--r-- | qtcreator.qbs | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/qtcreator.qbs b/qtcreator.qbs index 65e07932c0..3824ef22eb 100644 --- a/qtcreator.qbs +++ b/qtcreator.qbs @@ -5,10 +5,10 @@ Project { property string ide_version_minor: '7' property string ide_version_release: '84' property string qtcreator_version: ide_version_major + '.' + ide_version_minor + '.' + ide_version_release - 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_app_path: qbs.targetOS.contains("osx") ? "" : "bin" + property string ide_app_target: qbs.targetOS.contains("osx") ? "Qt Creator" : "qtcreator" property string ide_library_path: { - if (qbs.targetOS.contains("mac")) + if (qbs.targetOS.contains("osx")) return ide_app_target + ".app/Contents/PlugIns" else if (qbs.targetOS.contains("windows")) return ide_app_path @@ -16,23 +16,23 @@ Project { return "lib/qtcreator" } property string ide_plugin_path: { - if (qbs.targetOS.contains("mac")) + if (qbs.targetOS.contains("osx")) return ide_library_path else if (qbs.targetOS.contains("windows")) return "lib/qtcreator/plugins" else return ide_library_path + "/plugins" } - property string ide_data_path: qbs.targetOS.contains("mac") + property string ide_data_path: qbs.targetOS.contains("osx") ? ide_app_target + ".app/Contents/Resources" : "share/qtcreator" - property string ide_libexec_path: qbs.targetOS.contains("mac") + property string ide_libexec_path: qbs.targetOS.contains("osx") ? ide_data_path : ide_app_path - property string ide_doc_path: qbs.targetOS.contains("mac") + property string ide_doc_path: qbs.targetOS.contains("osx") ? ide_data_path + "/doc" : "share/doc/qtcreator" - property string ide_bin_path: qbs.targetOS.contains("mac") + property string ide_bin_path: qbs.targetOS.contains("osx") ? ide_app_target + ".app/Contents/MacOS" : ide_app_path moduleSearchPaths: "qbs" |