From b76992c3f508233c36b1dcff0512be16411aedbd Mon Sep 17 00:00:00 2001
From: Daniel Teske <daniel.teske@digia.com>
Date: Wed, 13 Mar 2013 16:53:17 +0100
Subject: [PATCH] AndroidQtVersionFactory: Do not detect
unsupported/android-g++
See qtbase commit 97fcf3bc987a18f32233fea550eb4a5a22e2b822
Change-Id: I4a94ab12a6bac0505fe4e6da4a72cb8b7e0b7032
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
---
src/plugins/android/androidqtversionfactory.cpp | 2 ++
1 file changed, 2 insertions(+)
diff --git a/src/plugins/android/androidqtversionfactory.cpp b/src/plugins/android/androidqtversionfactory.cpp
index a13aab48e70..ebdd5d6f5e7 100644
--- a/src/plugins/android/androidqtversionfactory.cpp
+++ b/src/plugins/android/androidqtversionfactory.cpp
@@ -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);
}
--
GitLab