From 45d6a34f1e7500a5caa2eaadfdc000837c415b05 Mon Sep 17 00:00:00 2001 From: Vikas Pachdha Date: Wed, 10 Jan 2018 12:22:00 +0100 Subject: [PATCH] Android: Fix BuilConfiguration priority calculation Check the supported devices and return the base priority set by the factory implementation Task-number: QTCREATORBUG-19573 Change-Id: Ieae68a618d625b3f16f205e544f4626e6a410b91 Reviewed-by: hjk --- src/plugins/projectexplorer/buildconfiguration.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/plugins/projectexplorer/buildconfiguration.cpp b/src/plugins/projectexplorer/buildconfiguration.cpp index b661a1cfda4..a550d49a4ee 100644 --- a/src/plugins/projectexplorer/buildconfiguration.cpp +++ b/src/plugins/projectexplorer/buildconfiguration.cpp @@ -338,8 +338,10 @@ int IBuildConfigurationFactory::priority(const Target *parent) const int IBuildConfigurationFactory::priority(const Kit *k, const QString &projectPath) const { QTC_ASSERT(!m_supportedProjectMimeTypeName.isEmpty(), return -1); - if (k && Utils::mimeTypeForFile(projectPath).matchesName(m_supportedProjectMimeTypeName)) - return 0; + if (k && Utils::mimeTypeForFile(projectPath).matchesName(m_supportedProjectMimeTypeName) && + m_supportedTargetDeviceTypes.contains(DeviceTypeKitInformation::deviceTypeId(k))) { + return m_basePriority; + } return -1; }