Change targetOS and hostOS to lists, and remove targetPlatform.

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

7 files changed, 16 insertions, 16 deletions

diff --git a/tests/auto/blackbox/testdata/codegen/codegen.qbs b/tests/auto/blackbox/testdata/codegen/codegen.qbs
index 29a3df8c1..6fdcbbb46 100644
--- a/tests/auto/blackbox/testdata/codegen/codegen.qbs
+++ b/tests/auto/blackbox/testdata/codegen/codegen.qbs
@@ -3,7 +3,7 @@ import qbs.fileinfo as FileInfo
 
 Project {
     property string name: 'codegen'
-    property string osSpecificName: name.toUpperCase() + '_' + qbs.targetOS.toUpperCase()
+    property string osSpecificName: name.toUpperCase() + '_' + qbs.targetOS[0].toUpperCase()
 
     Product {
         type: 'application'
@@ -41,7 +41,7 @@ Project {
             }
 
             // check whether we can access project properties here
-            var expected = "CODEGEN_" + product.moduleProperty("qbs", "targetOS").toUpperCase();
+            var expected = "CODEGEN_" + product.moduleProperty("qbs", "targetOS")[0].toUpperCase();
             if (project.osSpecificName !== expected)
                 throw "Wrong project property value: " + project.osSpecificName
                         + "\nexpected: " + expected;
@@ -50,7 +50,7 @@ Project {
             code = expandMacros(code, product.replacements);
             var args = ['echo ' + code + '>' + output.fileName]
             var cmd
-            if (product.moduleProperty("qbs", "hostOS") == 'windows') {
+            if (product.moduleProperty("qbs", "hostOS").contains('windows')) {
                 cmd = new Command('cmd.exe', ['/C'].concat(args));
             } else {
                 args[0] = args[0].replace(/\(/g, '\\(')
diff --git a/tests/auto/blackbox/testdata/sameBaseName/sameBaseName.qbs b/tests/auto/blackbox/testdata/sameBaseName/sameBaseName.qbs
index 6802be30b..e9b4ba7a6 100644
--- a/tests/auto/blackbox/testdata/sameBaseName/sameBaseName.qbs
+++ b/tests/auto/blackbox/testdata/sameBaseName/sameBaseName.qbs
@@ -17,7 +17,7 @@ Project {
         ]
 
         Group {
-            condition: qbs.targetPlatform.indexOf("darwin") !== -1
+            condition: qbs.targetOS.contains("darwin")
             files: [
                 "lib.m",
                 "lib.mm"
@@ -26,7 +26,7 @@ Project {
 
         Export {
             Depends { name: "cpp" }
-            cpp.frameworks: qbs.targetPlatform.indexOf("darwin") !== -1 ? "Foundation" : undefined
+            cpp.frameworks: qbs.targetOS.contains("darwin") ? "Foundation" : undefined
         }
     }
 }
diff --git a/tests/manual/CocoaApplication/CocoaApplication.qbs b/tests/manual/CocoaApplication/CocoaApplication.qbs
index d6812f650..80113c794 100644
--- a/tests/manual/CocoaApplication/CocoaApplication.qbs
+++ b/tests/manual/CocoaApplication/CocoaApplication.qbs
@@ -1,7 +1,7 @@
 import qbs 1.0
 
 CppApplication {
-    condition: qbs.targetOS === "osx"
+    condition: qbs.targetOS.contains("osx")
     type: "applicationbundle"
     name: "CocoaApplication"
 
diff --git a/tests/manual/configure/modules/definition/module.qbs b/tests/manual/configure/modules/definition/module.qbs
index 71b8ecf21..729656e96 100644
--- a/tests/manual/configure/modules/definition/module.qbs
+++ b/tests/manual/configure/modules/definition/module.qbs
@@ -9,7 +9,7 @@ Module {
         configure: {
             var cmd;
             var args;
-            if (qbs.targetOS === "windows") {
+            if (qbs.targetOS.contains("windows")) {
                 cmd = "cmd";
                 args = ["/c", "date", "/t"];
             } else {
diff --git a/tests/manual/minimumSystemVersion/minimumSystemVersion.qbs b/tests/manual/minimumSystemVersion/minimumSystemVersion.qbs
index 1f3430b0b..ddf8114e9 100644
--- a/tests/manual/minimumSystemVersion/minimumSystemVersion.qbs
+++ b/tests/manual/minimumSystemVersion/minimumSystemVersion.qbs
@@ -9,7 +9,7 @@ Project {
         files: "main.cpp"
 
         Properties {
-            condition: qbs.targetPlatform.indexOf("darwin") !== -1
+            condition: qbs.targetOS.contains("darwin")
             cpp.frameworks: "Foundation"
         }
     }
@@ -27,7 +27,7 @@ Project {
         cpp.minimumAndroidVersion: undefined
 
         Properties {
-            condition: qbs.targetPlatform.indexOf("darwin") !== -1
+            condition: qbs.targetOS.contains("darwin")
             cpp.frameworks: "Foundation"
         }
     }
@@ -38,17 +38,17 @@ Project {
     CppApplication {
         type: "application"
         Depends { name: "Qt.core" }
-        condition: qbs.targetOS === "windows" || qbs.targetOS === "osx"
+        condition: qbs.targetOS.contains("windows") || qbs.targetOS.contains("osx")
         name: "specific"
         files: "main.cpp"
 
         Properties {
-            condition: qbs.targetOS === "windows"
+            condition: qbs.targetOS.contains("windows")
             cpp.minimumWindowsVersion: "6.0"
         }
 
         Properties {
-            condition: qbs.targetOS === "osx"
+            condition: qbs.targetOS.contains("osx")
             cpp.frameworks: "Foundation"
             cpp.minimumOsxVersion: "10.6"
         }
@@ -60,7 +60,7 @@ Project {
     CppApplication {
         type: "application"
         Depends { name: "Qt.core" }
-        condition: qbs.targetOS === "windows"
+        condition: qbs.targetOS.contains("windows")
         name: "fakewindows"
         files: "main.cpp"
         cpp.minimumWindowsVersion: "5.3"
@@ -72,7 +72,7 @@ Project {
     CppApplication {
         type: "application"
         Depends { name: "Qt.core" }
-        condition: qbs.targetOS === "osx"
+        condition: qbs.targetOS.contains("osx")
         name: "macappstore"
         files: "main.cpp"
         cpp.frameworks: "Foundation"
diff --git a/tests/manual/objc/objc.qbs b/tests/manual/objc/objc.qbs
index c74595596..b878097c4 100644
--- a/tests/manual/objc/objc.qbs
+++ b/tests/manual/objc/objc.qbs
@@ -2,7 +2,7 @@ import qbs 1.0
 
 Project {
     CppApplication {
-        condition: qbs.targetOS === "osx"
+        condition: qbs.targetOS.contains("osx")
         Depends { name: "Qt.core" }
         files: "main.mm"
         cpp.frameworks: [ "Foundation" ]
diff --git a/tests/manual/propertiesblocks/propertiesblocks.qbs b/tests/manual/propertiesblocks/propertiesblocks.qbs
index f04762e69..5fe02a103 100644
--- a/tests/manual/propertiesblocks/propertiesblocks.qbs
+++ b/tests/manual/propertiesblocks/propertiesblocks.qbs
@@ -15,7 +15,7 @@ Product {
     }
 
     Properties {
-        condition: qbs.targetOS == "weird"
+        condition: qbs.targetOS.contains("weird")
         cpp.staticLibraries: "abc"
     }