5 files changed, 12 insertions, 43 deletions

diff --git a/src/plugins/boot2qt/qdbdevice.cpp b/src/plugins/boot2qt/qdbdevice.cpp
index 4a72a7c4a6..c6e388878d 100644
--- a/src/plugins/boot2qt/qdbdevice.cpp
+++ b/src/plugins/boot2qt/qdbdevice.cpp
@@ -200,18 +200,6 @@ void QdbDevice::setupDefaultNetworkSettings(const QString &host)
     setSshParameters(parameters);
 }
 
-std::function<ProjectExplorer::RunWorker *(ProjectExplorer::RunControl *)>
-    QdbDevice::workerCreator(Core::Id id) const
-{
-    if (id == "PerfRecorder") {
-        return [](ProjectExplorer::RunControl *runControl) {
-            return new QdbDevicePerfProfilerSupport(runControl);
-        };
-    }
-    return {};
-}
-
-
 // QdbDeviceWizard
 
 class QdbSettingsPage : public QWizardPage
diff --git a/src/plugins/boot2qt/qdbdevice.h b/src/plugins/boot2qt/qdbdevice.h
index d7a816097b..a0f6f9338f 100644
--- a/src/plugins/boot2qt/qdbdevice.h
+++ b/src/plugins/boot2qt/qdbdevice.h
@@ -52,9 +52,6 @@ public:
 
     void setupDefaultNetworkSettings(const QString &host);
 
-    std::function<ProjectExplorer::RunWorker *(ProjectExplorer::RunControl *)>
-        workerCreator(Core::Id id) const override;
-
 private:
     QdbDevice();
 
diff --git a/src/plugins/boot2qt/qdbdevicedebugsupport.cpp b/src/plugins/boot2qt/qdbdevicedebugsupport.cpp
index 7ef38ad832..c8c8c22349 100644
--- a/src/plugins/boot2qt/qdbdevicedebugsupport.cpp
+++ b/src/plugins/boot2qt/qdbdevicedebugsupport.cpp
@@ -175,17 +175,17 @@ void QdbDeviceDebugSupport::stop()
 
 // QdbDeviceQmlProfilerSupport
 
-QdbDeviceQmlToolingSupport::QdbDeviceQmlToolingSupport(RunControl *runControl,
-                                                       QmlDebug::QmlDebugServicesPreset services)
+QdbDeviceQmlToolingSupport::QdbDeviceQmlToolingSupport(RunControl *runControl)
     : RunWorker(runControl)
 {
     setId("QdbDeviceQmlToolingSupport");
 
+    QmlDebug::QmlDebugServicesPreset services = QmlDebug::servicesForRunMode(runControl->runMode());
     m_runner = new QdbDeviceInferiorRunner(runControl, false, false, true, services);
     addStartDependency(m_runner);
     addStopDependency(m_runner);
 
-    m_worker = runControl->createWorker(runControl->runMode());
+    m_worker = runControl->createWorker(QmlDebug::runnerIdForRunMode(runControl->runMode()));
     m_worker->addStartDependency(this);
     addStopDependency(m_worker);
 }
diff --git a/src/plugins/boot2qt/qdbdevicedebugsupport.h b/src/plugins/boot2qt/qdbdevicedebugsupport.h
index 0f07b20f48..8ed779d370 100644
--- a/src/plugins/boot2qt/qdbdevicedebugsupport.h
+++ b/src/plugins/boot2qt/qdbdevicedebugsupport.h
@@ -47,8 +47,7 @@ private:
 class QdbDeviceQmlToolingSupport : public ProjectExplorer::RunWorker
 {
 public:
-    QdbDeviceQmlToolingSupport(ProjectExplorer::RunControl *runControl,
-                               QmlDebug::QmlDebugServicesPreset services);
+    QdbDeviceQmlToolingSupport(ProjectExplorer::RunControl *runControl);
 
 private:
     void start() override;
@@ -57,22 +56,6 @@ private:
     ProjectExplorer::RunWorker *m_worker = nullptr;
 };
 
-class QdbDeviceQmlProfilerSupport : public QdbDeviceQmlToolingSupport
-{
-public:
-    QdbDeviceQmlProfilerSupport(ProjectExplorer::RunControl *runControl) :
-        QdbDeviceQmlToolingSupport(runControl, QmlDebug::QmlProfilerServices)
-    {}
-};
-
-class QdbDeviceQmlPreviewSupport : public QdbDeviceQmlToolingSupport
-{
-public:
-    QdbDeviceQmlPreviewSupport(ProjectExplorer::RunControl *runControl) :
-        QdbDeviceQmlToolingSupport(runControl, QmlDebug::QmlPreviewServices)
-    {}
-};
-
 class QdbDevicePerfProfilerSupport : public ProjectExplorer::RunWorker
 {
 public:
diff --git a/src/plugins/boot2qt/qdbplugin.cpp b/src/plugins/boot2qt/qdbplugin.cpp
index 2a3c85f085..804df7eab1 100644
--- a/src/plugins/boot2qt/qdbplugin.cpp
+++ b/src/plugins/boot2qt/qdbplugin.cpp
@@ -197,16 +197,17 @@ public:
         supportedRunConfigs,
         {Qdb::Constants::QdbLinuxOsType}
     };
-    RunWorkerFactory qmlProfilerWorkerFactory{
-        RunWorkerFactory::make<QdbDeviceQmlProfilerSupport>(),
-        {ProjectExplorer::Constants::QML_PROFILER_RUN_MODE},
+    RunWorkerFactory qmlToolWorkerFactory{
+        RunWorkerFactory::make<QdbDeviceQmlToolingSupport>(),
+        {ProjectExplorer::Constants::QML_PROFILER_RUN_MODE,
+         ProjectExplorer::Constants::QML_PREVIEW_RUN_MODE},
         supportedRunConfigs,
         {Qdb::Constants::QdbLinuxOsType}
     };
-    RunWorkerFactory qmlPreviewWorkerFactory{
-        RunWorkerFactory::make<QdbDeviceQmlPreviewSupport>(),
-        {ProjectExplorer::Constants::QML_PREVIEW_RUN_MODE},
-        supportedRunConfigs,
+    RunWorkerFactory perfRecorderFactory{
+        RunWorkerFactory::make<QdbDevicePerfProfilerSupport>(),
+        {"PerfRecorder"},
+        {},
         {Qdb::Constants::QdbLinuxOsType}
     };