Incredibuild: Simpler plugin setup

Change-Id: Ie838fb800b0b0f412e1b44989eed47e70c144747
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>

4 files changed, 16 insertions, 44 deletions

diff --git a/src/plugins/incredibuild/CMakeLists.txt b/src/plugins/incredibuild/CMakeLists.txt
index 81e0273b95d..f212046a15c 100644
--- a/src/plugins/incredibuild/CMakeLists.txt
+++ b/src/plugins/incredibuild/CMakeLists.txt
@@ -13,10 +13,9 @@ add_qtc_plugin(IncrediBuild
   ibconsolebuildstep.cpp
   ibconsolebuildstep.h
   incredibuild_global.h
-    incredibuildtr.h
   incredibuildconstants.h
   incredibuildplugin.cpp
-  incredibuildplugin.h
+  incredibuildtr.h
   makecommandbuilder.cpp
   makecommandbuilder.h
 )
diff --git a/src/plugins/incredibuild/incredibuild.qbs b/src/plugins/incredibuild/incredibuild.qbs
index e08d548691f..9c315ae8c08 100644
--- a/src/plugins/incredibuild/incredibuild.qbs
+++ b/src/plugins/incredibuild/incredibuild.qbs
@@ -19,10 +19,10 @@ QtcPlugin {
         "commandbuilderaspect.h",
         "ibconsolebuildstep.cpp",
         "ibconsolebuildstep.h",
-        "incredibuild_global.h", "incredibuildtr.h",
+        "incredibuild_global.h",
         "incredibuildconstants.h",
         "incredibuildplugin.cpp",
-        "incredibuildplugin.h",
+        "incredibuildtr.h",
         "makecommandbuilder.cpp",
         "makecommandbuilder.h",
     ]
diff --git a/src/plugins/incredibuild/incredibuildplugin.cpp b/src/plugins/incredibuild/incredibuildplugin.cpp
index 6e7ea8a4bc1..4e8f572812f 100644
--- a/src/plugins/incredibuild/incredibuildplugin.cpp
+++ b/src/plugins/incredibuild/incredibuildplugin.cpp
@@ -1,28 +1,26 @@
 // Copyright (C) 2020 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 
-#include "incredibuildplugin.h"
-
 #include "buildconsolebuildstep.h"
 #include "ibconsolebuildstep.h"
 
+#include <extensionsystem/iplugin.h>
+
 namespace IncrediBuild::Internal {
 
-class IncrediBuildPluginPrivate
+class IncrediBuildPlugin final : public ExtensionSystem::IPlugin
 {
+    Q_OBJECT
+    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QtCreatorPlugin" FILE "IncrediBuild.json")
+
 public:
-    BuildConsoleStepFactory buildConsoleStepFactory;
-    IBConsoleStepFactory iBConsoleStepFactory;
+    IncrediBuildPlugin()
+    {
+        addManaged<BuildConsoleStepFactory>();
+        addManaged<IBConsoleStepFactory>();
+    }
 };
 
-IncrediBuildPlugin::~IncrediBuildPlugin()
-{
-    delete d;
-}
-
-void IncrediBuildPlugin::initialize()
-{
-    d = new IncrediBuildPluginPrivate;
-}
-
 } // IncrediBuild::Internal
+
+#include "incredibuildplugin.moc"
diff --git a/src/plugins/incredibuild/incredibuildplugin.h b/src/plugins/incredibuild/incredibuildplugin.h
deleted file mode 100644
index 994d65bb777..00000000000
--- a/src/plugins/incredibuild/incredibuildplugin.h
+++ /dev/null
@@ -1,25 +0,0 @@
-// Copyright (C) 2020 The Qt Company Ltd.
-// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
-
-#pragma once
-
-#include <extensionsystem/iplugin.h>
-
-namespace IncrediBuild::Internal {
-
-class IncrediBuildPlugin final : public ExtensionSystem::IPlugin
-{
-    Q_OBJECT
-    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QtCreatorPlugin" FILE "IncrediBuild.json")
-
-public:
-    IncrediBuildPlugin() = default;
-    ~IncrediBuildPlugin() final;
-
-    void initialize() final;
-
-private:
-    class IncrediBuildPluginPrivate *d = nullptr;
-};
-
-} // IncrediBuild::Internal