QtSupport: Use setup pattern for QtOutputFormatter

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

src/plugins/qnx/qnxrunconfiguration.cpp

@@ -10,6 +10,7 @@
 #include <projectexplorer/deployablefile.h>
 #include <projectexplorer/project.h>
 #include <projectexplorer/runconfigurationaspects.h>
+#include <projectexplorer/runcontrol.h>
 #include <projectexplorer/target.h>
 
 #include <remotelinux/remotelinuxenvironmentaspect.h>

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,7 +220,10 @@ 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))
@@ -226,6 +231,12 @@ QtOutputFormatterFactory::QtOutputFormatterFactory()
             return {};
         });
     }
+};
+
+void setupQtOutputFormatter()
+{
+    static QtOutputFormatterFactory theQtOutputFormatterFactory;
+}
 
 } // QtSupport::Internal
 

src/plugins/qtsupport/qtoutputformatter.h

@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <projectexplorer/runcontrol.h>
+#include <QObject>
 
 // "file" or "qrc", colon, optional '//', '/' and further characters
 #define QT_QML_URL_REGEXP "(?:file|qrc):(?://)?/.+?"
@@ -14,11 +14,7 @@
 
 namespace QtSupport::Internal {
 
-class QtOutputFormatterFactory : public ProjectExplorer::OutputFormatterFactory
+void setupQtOutputFormatter();
-{
-public:
-    QtOutputFormatterFactory();
-};
 
 #ifdef WITH_TESTS
 QObject *createQtOutputFormatterTest();

src/plugins/qtsupport/qtsupportplugin.cpp

@@ -48,8 +48,6 @@ namespace QtSupport::Internal {
 class QtSupportPluginPrivate
 {
 public:
-    QtOutputFormatterFactory qtOutputFormatterFactory;
-
     UicGeneratorFactory uicGeneratorFactory;
     QScxmlcGeneratorFactory qscxmlcGeneratorFactory;
 
@@ -110,6 +108,7 @@ void QtSupportPlugin::initialize()
     setupEmbeddedLinuxQtVersion();
     setupGettingStartedWelcomePage();
     setupQtSettingsPage();
+    setupQtOutputFormatter();
 
     theProcessRunner() = processRunnerCallback;