Pass id to RunConfiguration constructor

It's what the base class requires, and opens the possibility to
have several factories creating the same type of run configuration.

Also move ios, winrt and android factories closer to their products,
it's the predominant pattern nowadays.

Change-Id: Iad48152f02a248d22cb18dd435a2fc34d73c7077
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>

1 files changed, 15 insertions, 2 deletions

diff --git a/src/plugins/winrt/winrtrunconfiguration.cpp b/src/plugins/winrt/winrtrunconfiguration.cpp
index bfb7e2fe675..72777f10239 100644
--- a/src/plugins/winrt/winrtrunconfiguration.cpp
+++ b/src/plugins/winrt/winrtrunconfiguration.cpp
@@ -36,6 +36,7 @@
 #include <utils/detailswidget.h>
 
 #include <qmakeprojectmanager/qmakeproject.h>
+#include <qmakeprojectmanager/qmakeprojectmanagerconstants.h>
 
 #include <QFormLayout>
 
@@ -57,8 +58,8 @@ public:
 };
 
 
-WinRtRunConfiguration::WinRtRunConfiguration(Target *target)
-    : RunConfiguration(target, Constants::WINRT_RC_PREFIX)
+WinRtRunConfiguration::WinRtRunConfiguration(Target *target, Core::Id id)
+    : RunConfiguration(target, id)
 {
     setDisplayName(tr("Run App Package"));
     addExtraAspect(new ArgumentsAspect(this, "WinRtRunConfigurationArgumentsId"));
@@ -135,6 +136,18 @@ QString WinRtRunConfiguration::executable() const
     return executable;
 }
 
+
+// WinRtRunConfigurationFactory
+
+WinRtRunConfigurationFactory::WinRtRunConfigurationFactory()
+{
+    registerRunConfiguration<WinRtRunConfiguration>("WinRt.WinRtRunConfiguration:");
+    addSupportedProjectType(QmakeProjectManager::Constants::QMAKEPROJECT_ID);
+    addSupportedTargetDeviceType(Constants::WINRT_DEVICE_TYPE_LOCAL);
+    addSupportedTargetDeviceType(Constants::WINRT_DEVICE_TYPE_PHONE);
+    addSupportedTargetDeviceType(Constants::WINRT_DEVICE_TYPE_EMULATOR);
+}
+
 } // namespace Internal
 } // namespace WinRt