QtSupport: Use setup pattern for QtOutputFormatter

Change-Id: Ic570a6503bedc4685d3d7f6222f1edab33fb6bad
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>

1 files changed, 17 insertions, 6 deletions

diff --git a/src/plugins/qtsupport/qtoutputformatter.cpp b/src/plugins/qtsupport/qtoutputformatter.cpp
index 4db23ec2a3..d1dcc59db4 100644
--- a/src/plugins/qtsupport/qtoutputformatter.cpp
+++ b/src/plugins/qtsupport/qtoutputformatter.cpp
@@ -8,6 +8,8 @@
 #include "qttestparser.h"
 
 #include <coreplugin/editormanager/editormanager.h>
+
+#include <projectexplorer/runcontrol.h>
 #include <projectexplorer/project.h>
 #include <projectexplorer/target.h>
 
@@ -218,13 +220,22 @@ void QtOutputLineParser::updateProjectFileList()
 
 // QtOutputFormatterFactory
 
-QtOutputFormatterFactory::QtOutputFormatterFactory()
+class QtOutputFormatterFactory final : public OutputFormatterFactory
+{
+public:
+    QtOutputFormatterFactory()
+    {
+        setFormatterCreator([](Target *t) -> QList<OutputLineParser *> {
+            if (QtKitAspect::qtVersion(t ? t->kit() : nullptr))
+                return {new QtTestParser, new QtOutputLineParser(t)};
+            return {};
+        });
+    }
+};
+
+void setupQtOutputFormatter()
 {
-    setFormatterCreator([](Target *t) -> QList<OutputLineParser *> {
-        if (QtKitAspect::qtVersion(t ? t->kit() : nullptr))
-            return {new QtTestParser, new QtOutputLineParser(t)};
-        return {};
-    });
+    static QtOutputFormatterFactory theQtOutputFormatterFactory;
 }
 
 } // QtSupport::Internal