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/imports | |
parent | ccf040239fa47dd3ee8b490367b4a8209e5a73ff (diff) |
Fix qbs build on macOS
"osx" -> "macos"
Change-Id: Ie25e096b2759cf8f96411560fcca337169d80b08
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
Diffstat (limited to 'qbs/imports')
-rw-r--r-- | qbs/imports/QtcAutotest.qbs | 2 | ||||
-rw-r--r-- | qbs/imports/QtcDocumentation.qbs | 2 | ||||
-rw-r--r-- | qbs/imports/QtcFunctions/functions.js | 2 | ||||
-rw-r--r-- | qbs/imports/QtcLibrary.qbs | 6 | ||||
-rw-r--r-- | qbs/imports/QtcPlugin.qbs | 6 | ||||
-rw-r--r-- | qbs/imports/QtcTool.qbs | 2 |
6 files changed, 10 insertions, 10 deletions
diff --git a/qbs/imports/QtcAutotest.qbs b/qbs/imports/QtcAutotest.qbs index 35d67e7af2..586626b22d 100644 --- a/qbs/imports/QtcAutotest.qbs +++ b/qbs/imports/QtcAutotest.qbs @@ -26,7 +26,7 @@ QtcProduct { // The following would be conceptually right, but does not work currently as some autotests // (e.g. extensionsystem) do not work when installed, because they want hardcoded // absolute paths to resources in the build directory. - // cpp.rpaths: qbs.targetOS.contains("osx") + // cpp.rpaths: qbs.targetOS.contains("macos") // ? ["@loader_path/../Frameworks", "@loader_path/../PlugIns"] // : ["$ORIGIN/../" + qtc.libDirName + "/qtcreator", // "$ORIGIN/../" qtc.libDirName + "/qtcreator/plugins"] diff --git a/qbs/imports/QtcDocumentation.qbs b/qbs/imports/QtcDocumentation.qbs index 350033be17..c98ee8dec3 100644 --- a/qbs/imports/QtcDocumentation.qbs +++ b/qbs/imports/QtcDocumentation.qbs @@ -28,7 +28,7 @@ Product { Group { fileTagsFilter: ["qch"] - qbs.install: !qbs.targetOS.contains("osx") + qbs.install: !qbs.targetOS.contains("macos") qbs.installDir: qtc.ide_doc_path } } diff --git a/qbs/imports/QtcFunctions/functions.js b/qbs/imports/QtcFunctions/functions.js index 23a51f80e8..c9dd1cf3a0 100644 --- a/qbs/imports/QtcFunctions/functions.js +++ b/qbs/imports/QtcFunctions/functions.js @@ -4,7 +4,7 @@ function qtLibraryName(qbs, name) if (qbs.debugInformation) { if (qbs.targetOS.contains("windows")) return name + "d"; - else if (qbs.targetOS.contains("osx")) + else if (qbs.targetOS.contains("macos")) return name + "_debug"; } return name; diff --git a/qbs/imports/QtcLibrary.qbs b/qbs/imports/QtcLibrary.qbs index e4dd782b11..5c54ba8894 100644 --- a/qbs/imports/QtcLibrary.qbs +++ b/qbs/imports/QtcLibrary.qbs @@ -18,14 +18,14 @@ QtcProduct { var flags = base; if (qbs.buildVariant == "debug" && qbs.toolchain.contains("msvc")) flags.push("/INCREMENTAL:NO"); // Speed up startup time when debugging with cdb - if (qbs.targetOS.contains("osx")) + if (qbs.targetOS.contains("macos")) flags.push("-compatibility_version", qtc.qtcreator_compat_version); return flags; } - cpp.sonamePrefix: qbs.targetOS.contains("osx") + cpp.sonamePrefix: qbs.targetOS.contains("macos") ? "@rpath" : undefined - cpp.rpaths: qbs.targetOS.contains("osx") + cpp.rpaths: qbs.targetOS.contains("macos") ? ["@loader_path/../Frameworks"] : ["$ORIGIN", "$ORIGIN/.."] property string libIncludeBase: ".." // #include <lib/header.h> diff --git a/qbs/imports/QtcPlugin.qbs b/qbs/imports/QtcPlugin.qbs index e18607ffba..8d68c234fe 100644 --- a/qbs/imports/QtcPlugin.qbs +++ b/qbs/imports/QtcPlugin.qbs @@ -27,17 +27,17 @@ QtcProduct { cpp.internalVersion: "" cpp.defines: base.concat([name.toUpperCase() + "_LIBRARY"]) - cpp.sonamePrefix: qbs.targetOS.contains("osx") + cpp.sonamePrefix: qbs.targetOS.contains("macos") ? "@rpath" : undefined - cpp.rpaths: qbs.targetOS.contains("osx") + cpp.rpaths: qbs.targetOS.contains("macos") ? ["@loader_path/../Frameworks", "@loader_path/../PlugIns"] : ["$ORIGIN", "$ORIGIN/.."] cpp.linkerFlags: { var flags = base; if (qbs.buildVariant == "debug" && qbs.toolchain.contains("msvc")) flags.push("/INCREMENTAL:NO"); // Speed up startup time when debugging with cdb - if (qbs.targetOS.contains("osx")) + if (qbs.targetOS.contains("macos")) flags.push("-compatibility_version", qtc.qtcreator_compat_version); return flags; } diff --git a/qbs/imports/QtcTool.qbs b/qbs/imports/QtcTool.qbs index e8dd54efaa..304e2e87a9 100644 --- a/qbs/imports/QtcTool.qbs +++ b/qbs/imports/QtcTool.qbs @@ -12,7 +12,7 @@ QtcProduct { '/' + qtc.ide_library_path); var relativePathToPlugins = FileInfo.relativePath('/' + qtc.ide_libexec_path, '/' + qtc.ide_plugin_path); - var prefix = qbs.targetOS.contains("osx") ? "@executable_path" : "$ORIGIN"; + var prefix = qbs.targetOS.contains("macos") ? "@executable_path" : "$ORIGIN"; return [ FileInfo.joinPaths(prefix, relativePathToLibs), FileInfo.joinPaths(prefix, relativePathToPlugins) |