Merge remote-tracking branch 'origin/4.1'

Change-Id: Ie96fa53a88bcd06fa688a579c1d84aaf6f5e905f

8 files changed, 19 insertions, 19 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 7e2488eb49..84806a6f30 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)
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 27d4dc608f..b86dbb3edb 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"