Commit b76992c3 authored by Daniel Teske's avatar Daniel Teske

AndroidQtVersionFactory: Do not detect unsupported/android-g++

See qtbase commit 97fcf3bc987a18f32233fea550eb4a5a22e2b822

Change-Id: I4a94ab12a6bac0505fe4e6da4a72cb8b7e0b7032
Reviewed-by: default avatarTobias Hunger <tobias.hunger@digia.com>
Reviewed-by: default avatarChristian Kandeler <christian.kandeler@digia.com>
parent 3662e9d2
......@@ -71,6 +71,8 @@ QtSupport::BaseQtVersion *AndroidQtVersionFactory::create(const Utils::FileName
if (!evaluator->values(QLatin1String("CONFIG")).contains(QLatin1String("android"))
&& evaluator->value(QLatin1String("QMAKE_PLATFORM")) != QLatin1String("android"))
return 0;
if (evaluator->values(QLatin1String("CONFIG")).contains(QLatin1String("android-no-sdk")))
return 0;
return new AndroidQtVersion(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