1 files changed, 15 insertions, 19 deletions

diff --git a/src/plugins/qtsupport/qtkitinformation.cpp b/src/plugins/qtsupport/qtkitinformation.cpp
index 6c5a8b90cb..2b94066158 100644
--- a/src/plugins/qtsupport/qtkitinformation.cpp
+++ b/src/plugins/qtsupport/qtkitinformation.cpp
@@ -25,8 +25,6 @@
 
 #include "qtkitinformation.h"
 
-#include <QRegExp>
-
 #include "qtsupportconstants.h"
 #include "qtversionmanager.h"
 #include "qtparser.h"
@@ -168,7 +166,7 @@ void QtKitAspect::setup(ProjectExplorer::Kit *k)
     if (!k || k->hasValue(id()))
         return;
     const Abi tcAbi = ToolChainKitAspect::targetAbi(k);
-    const Core::Id deviceType = DeviceTypeKitAspect::deviceTypeId(k);
+    const Utils::Id deviceType = DeviceTypeKitAspect::deviceTypeId(k);
 
     const QList<BaseQtVersion *> matches
             = QtVersionManager::versions([&tcAbi, &deviceType](const BaseQtVersion *qt) {
@@ -219,13 +217,14 @@ void QtKitAspect::fix(ProjectExplorer::Kit *k)
     }
 
     // Set a matching toolchain if we don't have one.
-    if (ToolChainKitAspect::toolChain(k, ProjectExplorer::Constants::CXX_LANGUAGE_ID))
+    if (ToolChainKitAspect::cxxToolChain(k))
         return;
+
     const QString spec = version->mkspec();
     QList<ToolChain *> possibleTcs = ToolChainManager::toolChains(
                 [version](const ToolChain *t) {
         return t->isValid()
-                && t->language() == Core::Id(ProjectExplorer::Constants::CXX_LANGUAGE_ID)
+                && t->language() == Utils::Id(ProjectExplorer::Constants::CXX_LANGUAGE_ID)
                 && contains(version->qtAbis(), [t](const Abi &qtAbi) {
                        return qtAbi.isFullyCompatibleWith(t->targetAbi());
                    });
@@ -287,14 +286,11 @@ void QtKitAspect::addToEnvironment(const ProjectExplorer::Kit *k, Utils::Environ
         version->addToEnvironment(k, env);
 }
 
-ProjectExplorer::IOutputParser *QtKitAspect::createOutputParser(const ProjectExplorer::Kit *k) const
+QList<Utils::OutputLineParser *> QtKitAspect::createOutputParsers(const Kit *k) const
 {
-    if (qtVersion(k)) {
-        const auto parser = new Internal::QtTestParser;
-        parser->appendOutputParser(new QtParser);
-        return parser;
-    }
-    return nullptr;
+    if (qtVersion(k))
+        return {new Internal::QtTestParser, new QtParser};
+    return {};
 }
 
 class QtMacroSubProvider
@@ -330,7 +326,7 @@ void QtKitAspect::addToMacroExpander(Kit *kit, MacroExpander *expander) const
                 });
 }
 
-Core::Id QtKitAspect::id()
+Utils::Id QtKitAspect::id()
 {
     return "QtSupport.QtInformation";
 }
@@ -398,7 +394,7 @@ void QtKitAspect::kitsWereLoaded()
             this, &QtKitAspect::qtVersionsChanged);
 }
 
-Kit::Predicate QtKitAspect::platformPredicate(Core::Id platform)
+Kit::Predicate QtKitAspect::platformPredicate(Utils::Id platform)
 {
     return [platform](const Kit *kit) -> bool {
         BaseQtVersion *version = QtKitAspect::qtVersion(kit);
@@ -406,7 +402,7 @@ Kit::Predicate QtKitAspect::platformPredicate(Core::Id platform)
     };
 }
 
-Kit::Predicate QtKitAspect::qtVersionPredicate(const QSet<Core::Id> &required,
+Kit::Predicate QtKitAspect::qtVersionPredicate(const QSet<Utils::Id> &required,
                                                     const QtVersionNumber &min,
                                                     const QtVersionNumber &max)
 {
@@ -423,16 +419,16 @@ Kit::Predicate QtKitAspect::qtVersionPredicate(const QSet<Core::Id> &required,
     };
 }
 
-QSet<Core::Id> QtKitAspect::supportedPlatforms(const Kit *k) const
+QSet<Utils::Id> QtKitAspect::supportedPlatforms(const Kit *k) const
 {
     BaseQtVersion *version = QtKitAspect::qtVersion(k);
-    return version ? version->targetDeviceTypes() : QSet<Core::Id>();
+    return version ? version->targetDeviceTypes() : QSet<Utils::Id>();
 }
 
-QSet<Core::Id> QtKitAspect::availableFeatures(const Kit *k) const
+QSet<Utils::Id> QtKitAspect::availableFeatures(const Kit *k) const
 {
     BaseQtVersion *version = QtKitAspect::qtVersion(k);
-    return version ? version->features() : QSet<Core::Id>();
+    return version ? version->features() : QSet<Utils::Id>();
 }
 
 int QtKitAspect::weight(const Kit *k) const