4 files changed, 6 insertions, 25 deletions
diff --git a/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin1/plugin1.cpp b/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin1/plugin1.cpp
index 98cfc0e7d4c..bd8c3fd50ee 100644
--- a/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin1/plugin1.cpp
+++ b/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin1/plugin1.cpp
@@ -25,15 +25,8 @@
 
 #include "plugin1.h"
 
-#include <qplugin.h>
-#include <QStringList>
-
 using namespace Plugin1;
 
-MyPlugin1::MyPlugin1()
-{
-}
-
 bool MyPlugin1::initialize(const QStringList &arguments, QString *errorString)
 {
     Q_UNUSED(arguments)
diff --git a/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin1/plugin1.h b/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin1/plugin1.h
index 556fc0ba6fc..4fe8e95fc37 100644
--- a/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin1/plugin1.h
+++ b/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin1/plugin1.h
@@ -27,9 +27,6 @@
 
 #include <extensionsystem/iplugin.h>
 
-#include <QObject>
-#include <QtGlobal>
-
 #if defined(PLUGIN1_LIBRARY)
 #  define PLUGIN1_EXPORT Q_DECL_EXPORT
 #else
@@ -44,10 +41,10 @@ class PLUGIN1_EXPORT MyPlugin1 : public ExtensionSystem::IPlugin
     Q_PLUGIN_METADATA(IID "plugin" FILE "plugin1.json")
 
 public:
-    MyPlugin1();
+    MyPlugin1() = default;
 
-    bool initialize(const QStringList &arguments, QString *errorString);
-    void extensionsInitialized();
+    bool initialize(const QStringList &arguments, QString *errorString) final;
+    void extensionsInitialized() final;
 };
 
 } // namespace Plugin1
diff --git a/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin2/plugin2.cpp b/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin2/plugin2.cpp
index 4d1bb259b74..3e6367dc3d8 100644
--- a/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin2/plugin2.cpp
+++ b/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin2/plugin2.cpp
@@ -25,14 +25,8 @@
 
 #include "plugin2.h"
 
-#include <qplugin.h>
-
 using namespace Plugin2;
 
-MyPlugin2::MyPlugin2()
-{
-}
-
 bool MyPlugin2::initialize(const QStringList &, QString *)
 {
     return true;
diff --git a/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin2/plugin2.h b/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin2/plugin2.h
index e5e38e33005..adaf926905e 100644
--- a/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin2/plugin2.h
+++ b/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin2/plugin2.h
@@ -27,9 +27,6 @@
 
 #include <extensionsystem/iplugin.h>
 
-#include <QObject>
-#include <QtGlobal>
-
 #if defined(PLUGIN2_LIBRARY)
 #  define PLUGIN2_EXPORT Q_DECL_EXPORT
 #else
@@ -44,10 +41,10 @@ class PLUGIN2_EXPORT MyPlugin2 : public ExtensionSystem::IPlugin
     Q_PLUGIN_METADATA(IID "plugin" FILE "plugin2.json")
 
 public:
-    MyPlugin2();
+    MyPlugin2() = default;
 
-    bool initialize(const QStringList &arguments, QString *errorString);
-    void extensionsInitialized();
+    bool initialize(const QStringList &arguments, QString *errorString) final;
+    void extensionsInitialized() final;
 };
 
 } // Plugin2