feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Android: Fix Qt detection, use QMAKE_PLATFORM to detect android

Browse Source 
Change-Id: I68591b92b25f41cd56f86403920ad38cf60d44d7
Reviewed-by: BogDan Vatra <bogdan@kde.org>
This commit is contained in:
Daniel Teske
2013-03-06 11:55:52 +01:00
parent 7789ba45f0
commit d7d15e57cf
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/plugins/android/androidqtversionfactory.cpp
View File

@@ -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);
} }