Commit d7d15e57 authored by Daniel Teske's avatar Daniel Teske
Browse files

Android: Fix Qt detection, use QMAKE_PLATFORM to detect android



Change-Id: I68591b92b25f41cd56f86403920ad38cf60d44d7
Reviewed-by: default avatarBogDan Vatra <bogdan@kde.org>
parent 7789ba45
...@@ -68,7 +68,8 @@ QtSupport::BaseQtVersion *AndroidQtVersionFactory::create(const Utils::FileName ...@@ -68,7 +68,8 @@ QtSupport::BaseQtVersion *AndroidQtVersionFactory::create(const Utils::FileName
QFileInfo fi(qmakePath.toString()); QFileInfo fi(qmakePath.toString());
if (!fi.exists() || !fi.isExecutable() || !fi.isFile()) if (!fi.exists() || !fi.isExecutable() || !fi.isFile())
return 0; return 0;
if (!evaluator->values(QLatin1String("CONFIG")).contains(QLatin1String("android"))) if (!evaluator->values(QLatin1String("CONFIG")).contains(QLatin1String("android"))
&& evaluator->value(QLatin1String("QMAKE_PLATFORM")) != QLatin1String("android"))
return 0; return 0;
return new AndroidQtVersion(qmakePath, isAutoDetected, autoDetectionSource); 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