From 20d22e52dfd3908bfdee7bb9bfd9fb95b7cec6b6 Mon Sep 17 00:00:00 2001
From: hjk <hjk@theqtcompany.com>
Date: Wed, 16 Dec 2015 13:11:46 +0100
Subject: [PATCH] BareMetal: Don't assert in displayNameForId() for unknown ids

This function can be called with arbitrary ids. Follow the pattern
in other device implementations and don't choke.

Change-Id: Ica25f2d24fe673ad025883bf106fc270f27fa4fe
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
Reviewed-by: Tim Sander <tim@krieglstein.org>
---
 src/plugins/baremetal/baremetaldeviceconfigurationfactory.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/plugins/baremetal/baremetaldeviceconfigurationfactory.cpp b/src/plugins/baremetal/baremetaldeviceconfigurationfactory.cpp
index 05abfa3ae95..3dface44f12 100644
--- a/src/plugins/baremetal/baremetaldeviceconfigurationfactory.cpp
+++ b/src/plugins/baremetal/baremetaldeviceconfigurationfactory.cpp
@@ -48,8 +48,7 @@ BareMetalDeviceConfigurationFactory::BareMetalDeviceConfigurationFactory(QObject
 
 QString BareMetalDeviceConfigurationFactory::displayNameForId(Core::Id type) const
 {
-    QTC_ASSERT(type == Constants::BareMetalOsType, return QString());
-    return tr("Bare Metal Device");
+    return type == Constants::BareMetalOsType ? tr("Bare Metal Device") : QString();
 }
 
 QList<Core::Id> BareMetalDeviceConfigurationFactory::availableCreationIds() const