Android: Use base method to list run configurations

The base method is good enough nowadays.

Change-Id: I8e7e9acbade239ff0dce4ac594b62d23cc5522cb
Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>

4 files changed, 7 insertions, 26 deletions

diff --git a/src/plugins/qmakeandroidsupport/qmakeandroidrunconfiguration.cpp b/src/plugins/qmakeandroidsupport/qmakeandroidrunconfiguration.cpp
index 5ae16c73c1..a352b97b64 100644
--- a/src/plugins/qmakeandroidsupport/qmakeandroidrunconfiguration.cpp
+++ b/src/plugins/qmakeandroidsupport/qmakeandroidrunconfiguration.cpp
@@ -100,6 +100,11 @@ void QmakeAndroidRunConfiguration::updateDisplayName()
     }
 }
 
+void QmakeAndroidRunConfiguration::doAdditionalSetup(const RunConfigurationCreationInfo &info)
+{
+    m_proFilePath = Utils::FileName::fromString(info.buildKey);
+}
+
 QString QmakeAndroidRunConfiguration::disabledReason() const
 {
     if (qmakeProject()->isParsing())
diff --git a/src/plugins/qmakeandroidsupport/qmakeandroidrunconfiguration.h b/src/plugins/qmakeandroidsupport/qmakeandroidrunconfiguration.h
index d4c5d45817..c731a59e10 100644
--- a/src/plugins/qmakeandroidsupport/qmakeandroidrunconfiguration.h
+++ b/src/plugins/qmakeandroidsupport/qmakeandroidrunconfiguration.h
@@ -50,6 +50,7 @@ private:
     bool fromMap(const QVariantMap &map) override;
     QVariantMap toMap() const override;
     void updateDisplayName();
+    void doAdditionalSetup(const ProjectExplorer::RunConfigurationCreationInfo &info) final;
 
     QmakeProjectManager::QmakeProject *qmakeProject() const;
 
diff --git a/src/plugins/qmakeandroidsupport/qmakeandroidrunfactories.cpp b/src/plugins/qmakeandroidsupport/qmakeandroidrunfactories.cpp
index 5fa073c9c4..021fdd5168 100644
--- a/src/plugins/qmakeandroidsupport/qmakeandroidrunfactories.cpp
+++ b/src/plugins/qmakeandroidsupport/qmakeandroidrunfactories.cpp
@@ -28,25 +28,12 @@
 
 #include <android/androidconstants.h>
 
-#include <projectexplorer/project.h>
-#include <projectexplorer/projectexplorerconstants.h>
-#include <projectexplorer/target.h>
-
-#include <qmakeprojectmanager/qmakenodes.h>
-#include <qmakeprojectmanager/qmakeproject.h>
 #include <qmakeprojectmanager/qmakeprojectmanagerconstants.h>
 
-#include <qtsupport/qtkitinformation.h>
-#include <qtsupport/qtsupportconstants.h>
-
-using namespace Android;
-using namespace ProjectExplorer;
-using namespace QmakeProjectManager;
-
 namespace QmakeAndroidSupport {
 namespace Internal {
 
-static const char ANDROID_RC_ID_PREFIX[] = "Qt4ProjectManager.AndroidRunConfiguration:";
+const char ANDROID_RC_ID_PREFIX[] = "Qt4ProjectManager.AndroidRunConfiguration:";
 
 QmakeAndroidRunConfigurationFactory::QmakeAndroidRunConfigurationFactory()
 {
@@ -55,12 +42,5 @@ QmakeAndroidRunConfigurationFactory::QmakeAndroidRunConfigurationFactory()
     addSupportedTargetDeviceType(Android::Constants::ANDROID_DEVICE_TYPE);
 }
 
-QList<RunConfigurationCreationInfo> QmakeAndroidRunConfigurationFactory::availableCreators(Target *parent) const
-{
-    auto project = qobject_cast<QmakeProject *>(parent->project());
-    QTC_ASSERT(project, return {});
-    return project->runConfigurationCreators(this, {ProjectType::ApplicationTemplate, ProjectType::SharedLibraryTemplate});
-}
-
 } // namespace Internal
 } // namespace Android
diff --git a/src/plugins/qmakeandroidsupport/qmakeandroidrunfactories.h b/src/plugins/qmakeandroidsupport/qmakeandroidrunfactories.h
index 51c7708e37..d80c2eaa04 100644
--- a/src/plugins/qmakeandroidsupport/qmakeandroidrunfactories.h
+++ b/src/plugins/qmakeandroidsupport/qmakeandroidrunfactories.h
@@ -32,13 +32,8 @@ namespace Internal {
 
 class QmakeAndroidRunConfigurationFactory : public ProjectExplorer::RunConfigurationFactory
 {
-    Q_OBJECT
-
 public:
     QmakeAndroidRunConfigurationFactory();
-
-    QList<ProjectExplorer::RunConfigurationCreationInfo>
-    availableCreators(ProjectExplorer::Target *parent) const;
 };
 
 } // namespace Internal