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

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

Browse Source 
See qtbase commit 97fcf3bc987a18f32233fea550eb4a5a22e2b822

Change-Id: I4a94ab12a6bac0505fe4e6da4a72cb8b7e0b7032
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
This commit is contained in:
Daniel Teske
2013-03-13 16:53:17 +01:00
parent 3662e9d289
commit b76992c3f5
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -71,6 +71,8 @@ QtSupport::BaseQtVersion *AndroidQtVersionFactory::create(const Utils::FileName
if (!evaluator->values(QLatin1String("CONFIG")).contains(QLatin1String("android")) if (!evaluator->values(QLatin1String("CONFIG")).contains(QLatin1String("android"))
&& evaluator->value(QLatin1String("QMAKE_PLATFORM")) != QLatin1String("android")) && evaluator->value(QLatin1String("QMAKE_PLATFORM")) != QLatin1String("android"))
return 0; return 0;
if (evaluator->values(QLatin1String("CONFIG")).contains(QLatin1String("android-no-sdk")))
return 0;
return new AndroidQtVersion(qmakePath, isAutoDetected, autoDetectionSource); return new AndroidQtVersion(qmakePath, isAutoDetected, autoDetectionSource);
} }