ProjectExplorer: Re-work setup runworker factories

This combines two of the previous three paths to create run workers,
and refers to RunConfigurations by id, not by type where possible
to decrease coupling between the classes.

Only allow "type of run configuration" and "type of device"
as the only possible kind of restriction and require a uniform
RunWorker constructor signature.

Adapt user code to fit that pattern.

Change-Id: I5a6d49c9a144785fd0235d7586f244b56f67b366
Reviewed-by: Christian Stenger <christian.stenger@qt.io>

1 files changed, 15 insertions, 6 deletions

diff --git a/src/plugins/qnx/qnxplugin.cpp b/src/plugins/qnx/qnxplugin.cpp
index 06f2701715..a078056136 100644
--- a/src/plugins/qnx/qnxplugin.cpp
+++ b/src/plugins/qnx/qnxplugin.cpp
@@ -115,12 +115,21 @@ public:
     QnxSettingsPage settingsPage;
     QnxToolChainFactory toolChainFactory;
 
-    SimpleRunWorkerFactory<SimpleTargetRunner, QnxRunConfiguration>
-        runWorkerFactory{ProjectExplorer::Constants::NORMAL_RUN_MODE};
-    SimpleRunWorkerFactory<QnxDebugSupport, QnxRunConfiguration>
-        debugWorkerFactory{ProjectExplorer::Constants::DEBUG_RUN_MODE};
-    SimpleRunWorkerFactory<QnxQmlProfilerSupport, QnxRunConfiguration>
-        qmlProfilerWorkerFactory;
+    RunWorkerFactory runWorkerFactory{
+        RunWorkerFactory::make<SimpleTargetRunner>(),
+        {ProjectExplorer::Constants::NORMAL_RUN_MODE},
+        {runConfigFactory.id()}
+    };
+    RunWorkerFactory debugWorkerFactory{
+        RunWorkerFactory::make<QnxDebugSupport>(),
+        {ProjectExplorer::Constants::DEBUG_RUN_MODE},
+        {runConfigFactory.id()}
+    };
+    RunWorkerFactory qmlProfilerWorkerFactory{
+        RunWorkerFactory::make<QnxQmlProfilerSupport>(),
+        {}, // FIXME: Shouldn't this use the run mode id somehow?
+        {runConfigFactory.id()}
+    };
 };
 
 static QnxPluginPrivate *dd = nullptr;