Add qbs.targetPlatform and qbs.hostPlatform properties

This allows users to set the target platform from within project files,
since it is a scalar value. The values of qbs.targetOS and qbs.hostOS
are now derived from these new scalar properties.

[ChangeLog] Added qbs.targetPlatform and qbs.hostPlatform properties
which are scalar versions of qbs.targetOS and qbs.hostOS.
qbs.targetPlatform is a "write-only" property that can be used to
set the OS/platform that is being targeted, while qbs.targetOS
and qbs.hostOS should continue to be used to *read* the OS/platform
that is being targeted. qbs.targetOS is also now read-only.

Task-number: QBS-1070
Change-Id: Id3fd206a5b2ebee2d626f3e5ab02ecd1dc90d90a
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>

1 files changed, 9 insertions, 9 deletions

diff --git a/tests/auto/blackbox/tst_blackboxapple.cpp b/tests/auto/blackbox/tst_blackboxapple.cpp
index 90f6494d9..9925265e8 100644
--- a/tests/auto/blackbox/tst_blackboxapple.cpp
+++ b/tests/auto/blackbox/tst_blackboxapple.cpp
@@ -292,7 +292,7 @@ void TestBlackboxApple::bundleStructure()
         // automatic detection
         const auto xcode5 = findXcodeVersion() >= qbs::Internal::Version(5);
         params.arguments
-                << "qbs.targetOS:ios,darwin,bsd,unix"
+                << "modules.qbs.targetPlatform:ios"
                 << (xcode5 ? "qbs.architectures:arm64" : "qbs.architectures:armv7a");
     }
 
@@ -523,7 +523,7 @@ void TestBlackboxApple::deploymentTarget()
     params.arguments = QStringList()
             << "--command-echo-mode"
             << "command-line"
-            << "qbs.targetOS:" + os
+            << "modules.qbs.targetPlatform:" + os
             << "qbs.architectures:" + arch;
 
     rmDirR(relativeBuildDir());
@@ -550,13 +550,13 @@ void TestBlackboxApple::deploymentTarget()
 
 void TestBlackboxApple::deploymentTarget_data()
 {
-    static const QString macos = QStringLiteral("macos,darwin,bsd,unix");
-    static const QString ios = QStringLiteral("ios,darwin,bsd,unix");
-    static const QString ios_sim = QStringLiteral("ios-simulator,") + ios;
-    static const QString tvos = QStringLiteral("tvos,darwin,bsd,unix");
-    static const QString tvos_sim = QStringLiteral("tvos-simulator,") + tvos;
-    static const QString watchos = QStringLiteral("watchos,darwin,bsd,unix");
-    static const QString watchos_sim = QStringLiteral("watchos-simulator,") + watchos;
+    static const QString macos = QStringLiteral("macos");
+    static const QString ios = QStringLiteral("ios");
+    static const QString ios_sim = QStringLiteral("ios-simulator");
+    static const QString tvos = QStringLiteral("tvos");
+    static const QString tvos_sim = QStringLiteral("tvos-simulator");
+    static const QString watchos = QStringLiteral("watchos");
+    static const QString watchos_sim = QStringLiteral("watchos-simulator");
 
     QTest::addColumn<QString>("sdk");
     QTest::addColumn<QString>("os");