Debugger: Use new plugin test object setup

Change-Id: Ic97dfd9aa22c4c8e41f81478983fb79760a76807
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>

2 files changed, 13 insertions, 24 deletions

diff --git a/src/plugins/debugger/debuggerplugin.cpp b/src/plugins/debugger/debuggerplugin.cpp
index cec06c16b0..8ab67c0bc5 100644
--- a/src/plugins/debugger/debuggerplugin.cpp
+++ b/src/plugins/debugger/debuggerplugin.cpp
@@ -2125,17 +2125,6 @@ DebuggerPlugin::~DebuggerPlugin()
     m_instance = nullptr;
 }
 
-bool DebuggerPlugin::initialize(const QStringList &arguments, QString *errorMessage)
-{
-    Q_UNUSED(errorMessage)
-
-    // Needed for call from AppOutputPane::attachToRunControl() and GammarayIntegration.
-    ExtensionSystem::PluginManager::addObject(this);
-
-    dd = new DebuggerPluginPrivate(arguments);
-    return true;
-}
-
 IPlugin::ShutdownFlag DebuggerPlugin::aboutToShutdown()
 {
     ExtensionSystem::PluginManager::removeObject(this);
@@ -2489,19 +2478,23 @@ void DebuggerUnitTests::testDebuggerMatching()
     QCOMPARE(expectedLevel, level);
 }
 
-QVector<QObject *> DebuggerPlugin::createTestObjects() const
+#endif // ifdef  WITH_TESTS
+
+bool DebuggerPlugin::initialize(const QStringList &arguments, QString *errorMessage)
 {
-    return {new DebuggerUnitTests};
-}
+    Q_UNUSED(errorMessage)
 
-#else // ^-- if WITH_TESTS else --v
+    // Needed for call from AppOutputPane::attachToRunControl() and GammarayIntegration.
+    ExtensionSystem::PluginManager::addObject(this);
 
-QVector<QObject *> DebuggerPlugin::createTestObjects() const
-{
-    return {};
-}
+    dd = new DebuggerPluginPrivate(arguments);
+
+#ifdef WITH_TESTS
+    addTest<DebuggerUnitTests>();
+#endif
 
-#endif // if  WITH_TESTS
+    return true;
+}
 
 } // Internal
 } // Debugger
diff --git a/src/plugins/debugger/debuggerplugin.h b/src/plugins/debugger/debuggerplugin.h
index 29e004ab50..209bd0454c 100644
--- a/src/plugins/debugger/debuggerplugin.h
+++ b/src/plugins/debugger/debuggerplugin.h
@@ -3,8 +3,6 @@
 
 #pragma once
 
-#include "debugger_global.h"
-
 #include <extensionsystem/iplugin.h>
 #include <utils/filepath.h>
 
@@ -42,8 +40,6 @@ private:
                                              QString *logMessage);
     Q_SLOT void removeDetectedDebuggers(const QString &detectionId, QString *logMessage);
     Q_SLOT void listDetectedDebuggers(const QString &detectionId, QString *logMessage);
-
-    QVector<QObject *> createTestObjects() const override;
 };
 
 } // Debugger::Internal