6 files changed, 18 insertions, 16 deletions
diff --git a/share/qbs/modules/cpp/CppModule.qbs b/share/qbs/modules/cpp/CppModule.qbs
index 7dabab95e..be2057ef0 100644
--- a/share/qbs/modules/cpp/CppModule.qbs
+++ b/share/qbs/modules/cpp/CppModule.qbs
@@ -83,10 +83,12 @@ Module {
     }
 
     property string minimumOsxVersion
+
+    property string minimumMacosVersion: minimumOsxVersion
     PropertyOptions {
-        name: "minimumOsxVersion"
+        name: "minimumMacosVersion"
         description: "a version number in the format [major].[minor] indicating the earliest \
-                        version of OS X that the product should run on. passes -mmacosx-version-min=<version> \
+                        version of macOS that the product should run on. passes -mmacosx-version-min=<version> \
                         to the compiler. if undefined, compiler defaults will be used."
     }
 
@@ -135,7 +137,7 @@ Module {
     PropertyOptions {
         name: "installNamePrefix"
         description: "The prefix for the internal install name (LC_ID_DYLIB) of a dynamic library \
-                      on Darwin (OS X and iOS)."
+                      on Darwin (macOS and iOS)."
     }
 
     property pathList includePaths
@@ -297,7 +299,7 @@ Module {
     property stringList platformObjcxxFlags
     property stringList platformLinkerFlags
 
-    // OS X and iOS properties
+    // Apple platforms properties
     property bool automaticReferenceCounting
     PropertyOptions {
         name: "automaticReferenceCounting"
diff --git a/share/qbs/modules/cpp/DarwinGCC.qbs b/share/qbs/modules/cpp/DarwinGCC.qbs
index 7232eb0d8..d4a5003ca 100644
--- a/share/qbs/modules/cpp/DarwinGCC.qbs
+++ b/share/qbs/modules/cpp/DarwinGCC.qbs
@@ -69,11 +69,11 @@ UnixGCC {
     property var defaultInfoPlist: {
         var dict = {};
 
-        if (qbs.targetOS.contains("osx")) {
+        if (qbs.targetOS.contains("macos")) {
             dict["NSPrincipalClass"] = "NSApplication"; // needed for Retina display support
 
-            if (minimumOsxVersion)
-                dict["LSMinimumSystemVersion"] = minimumOsxVersion;
+            if (minimumMacosVersion)
+                dict["LSMinimumSystemVersion"] = minimumMacosVersion;
         }
 
         if (qbs.targetOS.containsAny(["ios", "tvos"])) {
@@ -130,8 +130,8 @@ UnixGCC {
         // because this indicates the default deployment target for that OS
         if (qbs.targetOS.contains("ios"))
             env["IPHONEOS_DEPLOYMENT_TARGET"] = minimumIosVersion || "";
-        if (qbs.targetOS.contains("osx"))
-            env["MACOSX_DEPLOYMENT_TARGET"] = minimumOsxVersion || "";
+        if (qbs.targetOS.contains("macos"))
+            env["MACOSX_DEPLOYMENT_TARGET"] = minimumMacosVersion || "";
         if (qbs.targetOS.contains("watchos"))
             env["WATCHOS_DEPLOYMENT_TARGET"] = minimumWatchosVersion || "";
         if (qbs.targetOS.contains("tvos"))
diff --git a/share/qbs/modules/cpp/ios-gcc.qbs b/share/qbs/modules/cpp/ios-gcc.qbs
index 0708a22ef..49c7c645c 100644
--- a/share/qbs/modules/cpp/ios-gcc.qbs
+++ b/share/qbs/modules/cpp/ios-gcc.qbs
@@ -35,7 +35,7 @@ import qbs.FileInfo
 import qbs.ModUtils
 
 DarwinGCC {
-    condition: qbs.hostOS.contains('osx') &&
+    condition: qbs.hostOS.contains('macos') &&
                qbs.targetOS.contains('ios') &&
                qbs.toolchain && qbs.toolchain.contains('gcc')
 
diff --git a/share/qbs/modules/cpp/osx-gcc.qbs b/share/qbs/modules/cpp/macos-gcc.qbs
index a6c674d2c..af107d738 100644
--- a/share/qbs/modules/cpp/osx-gcc.qbs
+++ b/share/qbs/modules/cpp/macos-gcc.qbs
@@ -32,13 +32,13 @@ import qbs 1.0
 import qbs.ModUtils
 
 DarwinGCC {
-    condition: qbs.hostOS.contains('osx') &&
-               qbs.targetOS.contains('osx') &&
+    condition: qbs.hostOS.contains('macos') &&
+               qbs.targetOS.contains('macos') &&
                qbs.toolchain && qbs.toolchain.contains('gcc')
 
-    targetSystem: "macosx" + (minimumOsxVersion || "")
+    targetSystem: "macosx" + (minimumMacosVersion || "")
 
-    minimumDarwinVersion: minimumOsxVersion
+    minimumDarwinVersion: minimumMacosVersion
     minimumDarwinVersionCompilerFlag: "-mmacosx-version-min"
     minimumDarwinVersionLinkerFlag: "-macosx_version_min"
 }
diff --git a/share/qbs/modules/cpp/tvos-gcc.qbs b/share/qbs/modules/cpp/tvos-gcc.qbs
index 0e5f059d3..5378fa1b7 100644
--- a/share/qbs/modules/cpp/tvos-gcc.qbs
+++ b/share/qbs/modules/cpp/tvos-gcc.qbs
@@ -31,7 +31,7 @@
 import qbs
 
 DarwinGCC {
-    condition: qbs.hostOS.contains('osx') &&
+    condition: qbs.hostOS.contains('macos') &&
                qbs.targetOS.contains('tvos') &&
                qbs.toolchain && qbs.toolchain.contains('gcc')
 
diff --git a/share/qbs/modules/cpp/watchos-gcc.qbs b/share/qbs/modules/cpp/watchos-gcc.qbs
index e188eee8e..350cba02e 100644
--- a/share/qbs/modules/cpp/watchos-gcc.qbs
+++ b/share/qbs/modules/cpp/watchos-gcc.qbs
@@ -32,7 +32,7 @@
 import qbs
 
 DarwinGCC {
-    condition: qbs.hostOS.contains('osx') &&
+    condition: qbs.hostOS.contains('macos') &&
                qbs.targetOS.contains('watchos') &&
                qbs.toolchain && qbs.toolchain.contains('gcc')