Check ServerVersion first when retrieving Darwin product version.

This is the order the operating system checks in.

Change-Id: I5577c09867eb8c034bf1d47daba9d69b907ba62d
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>

1 files changed, 4 insertions, 4 deletions

diff --git a/share/qbs/modules/qbs/common.qbs b/share/qbs/modules/qbs/common.qbs
index 6491c89c5..0d55d86e1 100644
--- a/share/qbs/modules/qbs/common.qbs
+++ b/share/qbs/modules/qbs/common.qbs
@@ -9,8 +9,8 @@ Module {
     property stringList hostOS: getHostOS()
     property string hostOSVersion: {
         if (hostOS.contains("osx")) {
-            return getNativeSetting("/System/Library/CoreServices/SystemVersion.plist", "ProductVersion") ||
-                   getNativeSetting("/System/Library/CoreServices/ServerVersion.plist", "ProductVersion");
+            return getNativeSetting("/System/Library/CoreServices/ServerVersion.plist", "ProductVersion") ||
+                   getNativeSetting("/System/Library/CoreServices/SystemVersion.plist", "ProductVersion");
         } else if (hostOS.contains("windows")) {
             var version = getNativeSetting("HKEY_LOCAL_MACHINE\\Software\\Microsoft\\Windows NT\\CurrentVersion", "CurrentVersion");
             var build = getNativeSetting("HKEY_LOCAL_MACHINE\\Software\\Microsoft\\Windows NT\\CurrentVersion", "CurrentBuildNumber");
@@ -20,8 +20,8 @@ Module {
 
     property string hostOSBuildVersion: {
         if (hostOS.contains("osx")) {
-            return getNativeSetting("/System/Library/CoreServices/SystemVersion.plist", "ProductBuildVersion") ||
-                   getNativeSetting("/System/Library/CoreServices/ServerVersion.plist", "ProductBuildVersion");
+            return getNativeSetting("/System/Library/CoreServices/ServerVersion.plist", "ProductBuildVersion") ||
+                   getNativeSetting("/System/Library/CoreServices/SystemVersion.plist", "ProductBuildVersion");
         }
     }