diff options
Diffstat (limited to 'src/plugins/projectexplorer/kit.cpp')
| -rw-r--r-- | src/plugins/projectexplorer/kit.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/plugins/projectexplorer/kit.cpp b/src/plugins/projectexplorer/kit.cpp index 75f52ec1c8..e38c78fbc8 100644 --- a/src/plugins/projectexplorer/kit.cpp +++ b/src/plugins/projectexplorer/kit.cpp @@ -372,7 +372,7 @@ int Kit::weight() const }); } -static QIcon iconForDeviceType(Core::Id deviceType) +static QIcon iconForDeviceType(Utils::Id deviceType) { const IDeviceFactory *factory = Utils::findOrDefault(IDeviceFactory::allDeviceFactories(), [&deviceType](const IDeviceFactory *factory) { @@ -391,7 +391,7 @@ QIcon Kit::icon() const return d->m_cachedIcon; } - const Core::Id deviceType = d->m_deviceTypeForIcon.isValid() + const Utils::Id deviceType = d->m_deviceTypeForIcon.isValid() ? d->m_deviceTypeForIcon : DeviceTypeKitAspect::deviceTypeId(this); const QIcon deviceTypeIcon = iconForDeviceType(deviceType); if (!deviceTypeIcon.isNull()) { @@ -559,12 +559,12 @@ void Kit::addToEnvironment(Environment &env) const aspect->addToEnvironment(this, env); } -IOutputParser *Kit::createOutputParser() const +QList<OutputLineParser *> Kit::createOutputParsers() const { - auto first = new OsParser; + QList<OutputLineParser *> parsers{new OsParser}; for (KitAspect *aspect : KitManager::kitAspects()) - first->appendOutputParser(aspect->createOutputParser(this)); - return first; + parsers << aspect->createOutputParsers(this); + return parsers; } QString Kit::toHtml(const Tasks &additional, const QString &extraText) const |