summaryrefslogtreecommitdiff
path: root/src/app
diff options
context:
space:
mode:
authorJake Petroules <jake.petroules@qt.io>2017-07-24 22:34:00 -0700
committerJake Petroules <jake.petroules@qt.io>2017-08-01 18:31:15 +0000
commit0509689635b0de988eec30b6f4fff23b56e381e4 (patch)
tree27747628931b3a1e9349c3cc6a2178edf2f223bb /src/app
parentdb1c4ba74a9d3655f641c0d0a8d7e4628d977980 (diff)
downloadqbs-0509689635b0de988eec30b6f4fff23b56e381e4.tar.gz
Add initial support for Universal Windows Platform
[ChangeLog] Added initial support for the Universal Windows Platform (properties for which API families/partitions are available to code being compiled, and whether compiled binaries require an app container context to load/execute). Change-Id: Idd3e117bbb40bd547ae06c16318b2d2e38f07bb4 Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'src/app')
-rw-r--r--src/app/qbs-setup-qt/setupqt.cpp4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/app/qbs-setup-qt/setupqt.cpp b/src/app/qbs-setup-qt/setupqt.cpp
index e83c4255c..d6eb282eb 100644
--- a/src/app/qbs-setup-qt/setupqt.cpp
+++ b/src/app/qbs-setup-qt/setupqt.cpp
@@ -420,10 +420,8 @@ static QStringList qbsTargetOsFromQtMkspec(const QString &mkspec)
return QStringList() << QLatin1String("unixware") << QLatin1String("unix");
if (mkspec.startsWith(QLatin1String("vxworks-")))
return QStringList() << QLatin1String("vxworks") << QLatin1String("unix");
- if (mkspec.startsWith(QLatin1String("win32-")))
+ if (mkspec.startsWith(QLatin1String("win32-")) || mkspec.startsWith(QLatin1String("winrt-")))
return QStringList() << QLatin1String("windows");
- if (mkspec.startsWith(QLatin1String("winrt-")))
- return QStringList() << QLatin1String("winrt") << QLatin1String("windows");
return QStringList();
}