diff --git a/src/plugins/boot2qt/qdbplugin.cpp b/src/plugins/boot2qt/qdbplugin.cpp
index ee14e08a7bc..a73646b6c82 100644
--- a/src/plugins/boot2qt/qdbplugin.cpp
+++ b/src/plugins/boot2qt/qdbplugin.cpp
@@ -100,20 +100,6 @@ void registerFlashAction(QObject *parentForAction)
     toolsContainer->addAction(flashCommand, flashActionId);
 }
 
-class QdbQtVersionFactory : public QtSupport::QtVersionFactory
-{
-public:
-    QdbQtVersionFactory()
-    {
-        setQtVersionCreator([] { return new QdbQtVersion; });
-        setSupportedType("Qdb.EmbeddedLinuxQt");
-        setPriority(99);
-        setRestrictionChecker([](const SetupData &setup) {
-            return setup.platforms.contains("boot2qt");
-        });
-    }
-};
-
 template <class Step>
 class QdbDeployStepFactory : public ProjectExplorer::BuildStepFactory
 {
diff --git a/src/plugins/boot2qt/qdbqtversion.cpp b/src/plugins/boot2qt/qdbqtversion.cpp
index 7f15b32348b..3900220b7e7 100644
--- a/src/plugins/boot2qt/qdbqtversion.cpp
+++ b/src/plugins/boot2qt/qdbqtversion.cpp
@@ -6,17 +6,32 @@
 #include "qdbconstants.h"
 #include "qdbtr.h"
 
+#include <qtsupport/baseqtversion.h>
+#include <qtsupport/qtsupporttr.h>
+
 namespace Qdb::Internal {
 
-QString QdbQtVersion::description() const
+class QdbQtVersion : public QtSupport::QtVersion
 {
-    return Tr::tr("Boot2Qt", "Qt version is used for Boot2Qt development");
-}
+public:
+    QString description() const final
+    {
+        return QtSupport::Tr::tr("Boot2Qt", "Qt version is used for Boot2Qt development");
+    }
+    QSet<Utils::Id> targetDeviceTypes() const final
+    {
+        return {Utils::Id(Constants::QdbLinuxOsType)};
+    }
+};
 
-QSet<Utils::Id> QdbQtVersion::targetDeviceTypes() const
+QdbQtVersionFactory::QdbQtVersionFactory()
 {
-    return {Utils::Id(Constants::QdbLinuxOsType)};
-
+    setQtVersionCreator([] { return new QdbQtVersion; });
+    setSupportedType("Qdb.EmbeddedLinuxQt");
+    setPriority(99);
+    setRestrictionChecker([](const SetupData &setup) {
+        return setup.platforms.contains("boot2qt");
+    });
 }
 
 } // Qdb::Internal
diff --git a/src/plugins/boot2qt/qdbqtversion.h b/src/plugins/boot2qt/qdbqtversion.h
index 3488324074b..2b27277f48b 100644
--- a/src/plugins/boot2qt/qdbqtversion.h
+++ b/src/plugins/boot2qt/qdbqtversion.h
@@ -3,18 +3,14 @@
 
 #pragma once
 
-#include <qtsupport/baseqtversion.h>
+#include <qtsupport/qtversionfactory.h>
 
 namespace Qdb::Internal {
 
-class QdbQtVersion : public QtSupport::QtVersion
+class QdbQtVersionFactory : public QtSupport::QtVersionFactory
 {
 public:
-    QdbQtVersion() = default;
-    ~QdbQtVersion() = default;
-
-    QString description() const final;
-    QSet<Utils::Id> targetDeviceTypes() const final;
+    QdbQtVersionFactory();
 };
 
 } // Qdb::Internal