ExtensionSystem: Stop reworking initialization order system

This reverts b91f234c7da and some changes on top.

With the static-in-function approach the dependency seem to be
more easier to solve than with the the central mechanism here.

Change-Id: I65be3ced847b31c25637280376f2fe30003f0527
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>

1 files changed, 13 insertions, 7 deletions

diff --git a/src/plugins/autotoolsprojectmanager/autotoolsprojectplugin.cpp b/src/plugins/autotoolsprojectmanager/autotoolsprojectplugin.cpp
index 8649236e152..7dd53126506 100644
--- a/src/plugins/autotoolsprojectmanager/autotoolsprojectplugin.cpp
+++ b/src/plugins/autotoolsprojectmanager/autotoolsprojectplugin.cpp
@@ -74,6 +74,16 @@ public:
  *   be executed in the build process)
  */
 
+class AutotoolsProjectPluginPrivate
+{
+public:
+    AutotoolsBuildConfigurationFactory buildConfigFactory;
+    MakeStepFactory makeStepFactory;
+    AutogenStepFactory autogenStepFactory;
+    ConfigureStepFactory configureStepFactory;
+    AutoreconfStepFactory autoreconfStepFactory;
+};
+
 class AutotoolsProjectPlugin final : public ExtensionSystem::IPlugin
 {
     Q_OBJECT
@@ -81,14 +91,10 @@ class AutotoolsProjectPlugin final : public ExtensionSystem::IPlugin
 
     void initialize() final
     {
-        ProjectManager::registerProjectType<AutotoolsProject>(Constants::MAKEFILE_MIMETYPE);
-
-        addManaged<AutotoolsBuildConfigurationFactory>();
-        addManaged<MakeStepFactory>();
-        addManaged<AutogenStepFactory>();
-        addManaged<ConfigureStepFactory>();
-        addManaged<AutoreconfStepFactory>();
+        d = std::make_unique<AutotoolsProjectPluginPrivate>();
     }
+
+    std::unique_ptr<AutotoolsProjectPluginPrivate> d;
 };
 
 } // AutotoolsProjectManager::Internal