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

Android: Avoid toolchain check for QML projects

Browse Source 
Change-Id: I4d70b696bd5e8ea5460d20f13ba3ac72550e48c3
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
This commit is contained in:
Vikas Pachdha
2018-07-18 14:00:43 +02:00
parent 3ce783b0ea
commit 6fa2901173
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/plugins/android/androiddeployconfiguration.cpp
View File

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