From 6fa2901173ec0f94d1115dfc0eb114a8784228b0 Mon Sep 17 00:00:00 2001
From: Vikas Pachdha <vikas.pachdha@qt.io>
Date: Wed, 18 Jul 2018 14:00:43 +0200
Subject: [PATCH] Android: Avoid toolchain check for QML projects

Change-Id: I4d70b696bd5e8ea5460d20f13ba3ac72550e48c3
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
---
 src/plugins/android/androiddeployconfiguration.cpp | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/plugins/android/androiddeployconfiguration.cpp b/src/plugins/android/androiddeployconfiguration.cpp
index 5987db8496d..bb0169db0e6 100644
--- a/src/plugins/android/androiddeployconfiguration.cpp
+++ b/src/plugins/android/androiddeployconfiguration.cpp
@@ -63,10 +63,13 @@ AndroidDeployConfigurationFactory::AndroidDeployConfigurationFactory()
 
 QList<QString> AndroidDeployConfigurationFactory::availableBuildTargets(Target *parent) const
 {
-    ToolChain *tc = ToolChainKitInformation::toolChain(parent->kit(), ProjectExplorer::Constants::CXX_LANGUAGE_ID);
-
-    if (!tc || tc->targetAbi().osFlavor() != Abi::AndroidLinuxFlavor)
-        return {};
+    if (!parent->project()->id().name().startsWith("QmlProjectManager.QmlProject")) {
+        // Avoid tool chain check for QML Project
+        Core::Id cxxLangId(ProjectExplorer::Constants::CXX_LANGUAGE_ID);
+        ToolChain *tc = ToolChainKitInformation::toolChain(parent->kit(), cxxLangId);
+        if (!tc || tc->targetAbi().osFlavor() != Abi::AndroidLinuxFlavor)
+            return {};
+    }
 
     QtSupport::BaseQtVersion *qt = QtSupport::QtKitInformation::qtVersion(parent->kit());
     if (!qt || qt->type() != Constants::ANDROIDQT)