From e6fb9f08db4250dfa12cd492311e59e11a99de1d Mon Sep 17 00:00:00 2001
From: Ulf Hermann <ulf.hermann@qt.io>
Date: Wed, 6 Dec 2017 10:49:29 +0100
Subject: [PATCH] KitManager: Check availableCreationIds before asking for
 displayName

device factories will generally QTC_ASSERT when asked for IDs they don't
support. When asked for IDs they do support they should provide a
non-empty display name, though.

Change-Id: I1439fa7bec1791979dfdf28a6ee70e2e77ec8381
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
---
 src/plugins/projectexplorer/kitmanager.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/plugins/projectexplorer/kitmanager.cpp b/src/plugins/projectexplorer/kitmanager.cpp
index 005be16ab83..d48c9a389e6 100644
--- a/src/plugins/projectexplorer/kitmanager.cpp
+++ b/src/plugins/projectexplorer/kitmanager.cpp
@@ -561,9 +561,11 @@ QSet<Id> KitFeatureProvider::availablePlatforms() const
 QString KitFeatureProvider::displayNameForPlatform(Id id) const
 {
     foreach (IDeviceFactory *f, ExtensionSystem::PluginManager::getObjects<IDeviceFactory>()) {
-        const QString dn = f->displayNameForId(id);
-        if (!dn.isEmpty())
+        if (f->availableCreationIds().contains(id)) {
+            const QString dn = f->displayNameForId(id);
+            QTC_ASSERT(!dn.isEmpty(), continue);
             return dn;
+        }
     }
     return QString();
 }