WinRtRunConfigFactory: Use base method to list run configs

Change-Id: I444b676d522cea88f024d33d56ce407341c12274
Reviewed-by: David Schulz <david.schulz@qt.io>

5 files changed, 8 insertions, 29 deletions

diff --git a/src/plugins/winrt/winrtpackagedeploymentstep.cpp b/src/plugins/winrt/winrtpackagedeploymentstep.cpp
index 5b9da4f611..9ba820693c 100644
--- a/src/plugins/winrt/winrtpackagedeploymentstep.cpp
+++ b/src/plugins/winrt/winrtpackagedeploymentstep.cpp
@@ -61,14 +61,8 @@ bool WinRtPackageDeploymentStep::init(QList<const BuildStep *> &earlierSteps)
                 target()->activeRunConfiguration());
     QTC_ASSERT(rc, return false);
 
-    const Utils::FileName activeProjectFilePath = Utils::FileName::fromString(rc->proFilePath());
-    Utils::FileName appTargetFilePath;
-    foreach (const BuildTargetInfo &buildTarget, target()->applicationTargets().list) {
-        if (buildTarget.projectFilePath == activeProjectFilePath) {
-            appTargetFilePath = buildTarget.targetFilePath;
-            break;
-        }
-    }
+    Utils::FileName appTargetFilePath =
+            target()->applicationTargets().buildTargetInfo(rc->proFilePath()).targetFilePath;
 
     m_targetFilePath = appTargetFilePath.toString();
     if (m_targetFilePath.isEmpty()) {
diff --git a/src/plugins/winrt/winrtrunconfiguration.cpp b/src/plugins/winrt/winrtrunconfiguration.cpp
index cba6527037..8ddc92e09a 100644
--- a/src/plugins/winrt/winrtrunconfiguration.cpp
+++ b/src/plugins/winrt/winrtrunconfiguration.cpp
@@ -75,6 +75,11 @@ bool WinRtRunConfiguration::fromMap(const QVariantMap &map)
     return true;
 }
 
+void WinRtRunConfiguration::doAdditionalSetup(const ProjectExplorer::RunConfigurationCreationInfo &info)
+{
+    m_proFilePath = info.buildKey;
+}
+
 QString WinRtRunConfiguration::arguments() const
 {
     return extraAspect<ProjectExplorer::ArgumentsAspect>()->arguments();
diff --git a/src/plugins/winrt/winrtrunconfiguration.h b/src/plugins/winrt/winrtrunconfiguration.h
index aa07a14261..4c378ec14d 100644
--- a/src/plugins/winrt/winrtrunconfiguration.h
+++ b/src/plugins/winrt/winrtrunconfiguration.h
@@ -61,6 +61,7 @@ private:
     bool m_uninstallAfterStop = false;
 
     QString executable() const;
+    void doAdditionalSetup(const ProjectExplorer::RunConfigurationCreationInfo &info) final;
 };
 
 } // namespace Internal
diff --git a/src/plugins/winrt/winrtrunfactories.cpp b/src/plugins/winrt/winrtrunfactories.cpp
index ad0a5f304d..8f1aabcae2 100644
--- a/src/plugins/winrt/winrtrunfactories.cpp
+++ b/src/plugins/winrt/winrtrunfactories.cpp
@@ -28,15 +28,9 @@
 #include "winrtruncontrol.h"
 #include "winrtconstants.h"
 
-#include <projectexplorer/project.h>
-#include <projectexplorer/target.h>
-
-#include <qmakeprojectmanager/qmakeproject.h>
 #include <qmakeprojectmanager/qmakeprojectmanagerconstants.h>
 
 using namespace ProjectExplorer;
-using QmakeProjectManager::QmakeProject;
-using QmakeProjectManager::QmakeProFile;
 
 namespace WinRt {
 namespace Internal {
@@ -50,16 +44,5 @@ WinRtRunConfigurationFactory::WinRtRunConfigurationFactory()
     addSupportedTargetDeviceType(Constants::WINRT_DEVICE_TYPE_EMULATOR);
 }
 
-QList<RunConfigurationCreationInfo> WinRtRunConfigurationFactory::availableCreators(Target *parent) const
-{
-    QmakeProject *project = qobject_cast<QmakeProject *>(parent->project());
-    QTC_ASSERT(project, return {});
-    const QList<RunConfigurationCreationInfo> list = project->runConfigurationCreators(this);
-    return Utils::transform(list, [](RunConfigurationCreationInfo rci) {
-        rci.displayName = tr("Run App Package");
-        return rci;
-    });
-}
-
 } // namespace Internal
 } // namespace WinRt
diff --git a/src/plugins/winrt/winrtrunfactories.h b/src/plugins/winrt/winrtrunfactories.h
index b6548633dd..47829bc04b 100644
--- a/src/plugins/winrt/winrtrunfactories.h
+++ b/src/plugins/winrt/winrtrunfactories.h
@@ -34,12 +34,8 @@ namespace Internal {
 
 class WinRtRunConfigurationFactory  : public ProjectExplorer::RunConfigurationFactory
 {
-    Q_OBJECT
 public:
     WinRtRunConfigurationFactory();
-
-    QList<ProjectExplorer::RunConfigurationCreationInfo>
-    availableCreators(ProjectExplorer::Target *parent) const override;
 };
 
 } // namespace Internal