Commit fdb54362 authored by Joerg Bornemann's avatar Joerg Bornemann

WinRt: fix detection of desktop Qt builds

Task-number: QTCREATORBUG-11715

Change-Id: I57ccece77c024c0814eb51a67e6e40faa0bb5ee5
Reviewed-by: default avatarAndrew Knight <andrew.knight@digia.com>
parent fe184c45
......@@ -80,14 +80,21 @@ QtSupport::BaseQtVersion *WinRtQtVersionFactory::create(const Utils::FileName &q
if (!fi.exists() || !fi.isExecutable() || !fi.isFile())
return 0;
bool isWinRt = false;
bool isPhone = false;
foreach (const QString &value, evaluator->values(QLatin1String("QMAKE_PLATFORM"))) {
if (value == QStringLiteral("winphone")) {
if (value == QStringLiteral("winrt")) {
isWinRt = true;
} else if (value == QStringLiteral("winphone")) {
isWinRt = true;
isPhone = true;
break;
}
}
if (!isWinRt)
return 0;
return isPhone ? new WinRtPhoneQtVersion(qmakePath, isAutoDetected, autoDetectionSource)
: new WinRtQtVersion(qmakePath, isAutoDetected, autoDetectionSource);
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment