diff options
| author | Christian Kandeler <christian.kandeler@theqtcompany.com> | 2016-07-28 11:29:06 +0200 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@qt.io> | 2016-07-28 14:45:12 +0000 |
| commit | b1477190de01afb12cc11a326f0fd36c8f026e06 (patch) | |
| tree | 19a008f11f7b7ba6b84035325465ca966249fd39 /qbs/modules | |
| parent | ccf040239fa47dd3ee8b490367b4a8209e5a73ff (diff) | |
| download | qt-creator-b1477190de01afb12cc11a326f0fd36c8f026e06.tar.gz | |
Fix qbs build on macOS
"osx" -> "macos"
Change-Id: Ie25e096b2759cf8f96411560fcca337169d80b08
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
Diffstat (limited to 'qbs/modules')
| -rw-r--r-- | qbs/modules/qbsbuildconfig/qbsbuildconfig.qbs | 2 | ||||
| -rw-r--r-- | qbs/modules/qtc/qtc.qbs | 16 |
2 files changed, 9 insertions, 9 deletions
diff --git a/qbs/modules/qbsbuildconfig/qbsbuildconfig.qbs b/qbs/modules/qbsbuildconfig/qbsbuildconfig.qbs index 88128a97d1..00d2d34bdd 100644 --- a/qbs/modules/qbsbuildconfig/qbsbuildconfig.qbs +++ b/qbs/modules/qbsbuildconfig/qbsbuildconfig.qbs @@ -8,7 +8,7 @@ Module { property bool enableProjectFileUpdates: true property bool installApiHeaders: false property string libInstallDir: qtc.ide_library_path - property stringList libRPaths: qbs.targetOS.contains("osx") + property stringList libRPaths: qbs.targetOS.contains("macos") ? ["@loader_path/" + FileInfo.relativePath('/' + appInstallDir, '/' + libInstallDir)] : ["$ORIGIN/..", "$ORIGIN/../" + qtc.ide_library_path] property string resourcesInstallDir: qtc.ide_data_path + "/qbs" diff --git a/qbs/modules/qtc/qtc.qbs b/qbs/modules/qtc/qtc.qbs index 955850dfa9..65ea37e714 100644 --- a/qbs/modules/qtc/qtc.qbs +++ b/qbs/modules/qtc/qtc.qbs @@ -16,10 +16,10 @@ Module { + ide_compat_version_minor + '.' + ide_compat_version_release property string libDirName: "lib" - 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_app_path: qbs.targetOS.contains("macos") ? "" : "bin" + property string ide_app_target: qbs.targetOS.contains("macos") ? "Qt Creator" : "qtcreator" property string ide_library_path: { - if (qbs.targetOS.contains("osx")) + if (qbs.targetOS.contains("macos")) return ide_app_target + ".app/Contents/Frameworks" else if (qbs.targetOS.contains("windows")) return ide_app_path @@ -27,24 +27,24 @@ Module { return libDirName + "/qtcreator" } property string ide_plugin_path: { - if (qbs.targetOS.contains("osx")) + if (qbs.targetOS.contains("macos")) return ide_app_target + ".app/Contents/PlugIns" else if (qbs.targetOS.contains("windows")) return libDirName + "/qtcreator/plugins" else return ide_library_path + "/plugins" } - property string ide_data_path: qbs.targetOS.contains("osx") + property string ide_data_path: qbs.targetOS.contains("macos") ? ide_app_target + ".app/Contents/Resources" : "share/qtcreator" - property string ide_libexec_path: qbs.targetOS.contains("osx") + property string ide_libexec_path: qbs.targetOS.contains("macos") ? ide_data_path : qbs.targetOS.contains("windows") ? ide_app_path : "libexec/qtcreator" - property string ide_bin_path: qbs.targetOS.contains("osx") + property string ide_bin_path: qbs.targetOS.contains("macos") ? ide_app_target + ".app/Contents/MacOS" : ide_app_path - property string ide_doc_path: qbs.targetOS.contains("osx") + property string ide_doc_path: qbs.targetOS.contains("macos") ? ide_data_path + "/doc" : "share/doc/qtcreator" property string ide_include_path: "include" |