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

KitManager: Check availableCreationIds before asking for displayName

Browse Source 
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>
This commit is contained in:
Ulf Hermann
2017-12-06 10:49:29 +01:00
committed by Tobias Hunger
parent 8afa7a64cc
commit e6fb9f08db
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/projectexplorer/kitmanager.cpp
View File

@@ -561,9 +561,11 @@ QSet<Id> KitFeatureProvider::availablePlatforms() const
QString KitFeatureProvider::displayNameForPlatform(Id id) const QString KitFeatureProvider::displayNameForPlatform(Id id) const
{ {
foreach (IDeviceFactory *f, ExtensionSystem::PluginManager::getObjects<IDeviceFactory>()) { foreach (IDeviceFactory *f, ExtensionSystem::PluginManager::getObjects<IDeviceFactory>()) {
const QString dn = f->displayNameForId(id); if (f->availableCreationIds().contains(id)) {
if (!dn.isEmpty()) const QString dn = f->displayNameForId(id);
QTC_ASSERT(!dn.isEmpty(), continue);
return dn; return dn;
}
} }
return QString(); return QString();
} }