From 82fd4fa7176072d2b65b47bef371b83c655f928b Mon Sep 17 00:00:00 2001
From: hjk <hjk@qt.io>
Date: Wed, 16 May 2018 09:34:54 +0200
Subject: [PATCH] QmakeAndroid: Move RunConfigurationFactory to Android base

The RunConfiguration does not depend on qmake anymore.

This makes the factory trigger in theory for non-qmake, too, but since
we still not support other build systems for android, it has no
practical consequences yet.

Change-Id: I95e4e5a81f5b405a52fa42723b25a0a1473e78c6
Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
---
 src/plugins/android/androidplugin.cpp         | 12 +++++++++++
 .../qmakeandroidsupportplugin.cpp             | 20 -------------------
 2 files changed, 12 insertions(+), 20 deletions(-)

diff --git a/src/plugins/android/androidplugin.cpp b/src/plugins/android/androidplugin.cpp
index 6f44abbbbd3..3e5ace89e82 100644
--- a/src/plugins/android/androidplugin.cpp
+++ b/src/plugins/android/androidplugin.cpp
@@ -62,6 +62,17 @@ using namespace ProjectExplorer::Constants;
 namespace Android {
 namespace Internal {
 
+class AndroidRunConfigurationFactory : public RunConfigurationFactory
+{
+public:
+    AndroidRunConfigurationFactory()
+    {
+        registerRunConfiguration<Android::AndroidRunConfiguration>
+                ("Qt4ProjectManager.AndroidRunConfiguration:");
+        addSupportedTargetDeviceType(Android::Constants::ANDROID_DEVICE_TYPE);
+    }
+};
+
 class AndroidPluginPrivate
 {
 public:
@@ -76,6 +87,7 @@ public:
     JavaEditorFactory javaEditorFactory;
     AndroidPackageInstallationFactory packackeInstallationFactory;
     AndroidManifestEditorFactory manifestEditorFactory;
+    AndroidRunConfigurationFactory runConfigFactory;
 };
 
 AndroidPlugin::~AndroidPlugin()
diff --git a/src/plugins/qmakeandroidsupport/qmakeandroidsupportplugin.cpp b/src/plugins/qmakeandroidsupport/qmakeandroidsupportplugin.cpp
index f8a50df53cd..e532ef5632b 100644
--- a/src/plugins/qmakeandroidsupport/qmakeandroidsupportplugin.cpp
+++ b/src/plugins/qmakeandroidsupport/qmakeandroidsupportplugin.cpp
@@ -29,36 +29,16 @@
 #include "qmakeandroidbuildapkstep.h"
 #include "qmakeandroidsupport.h"
 
-#include <android/androidconstants.h>
-#include <android/androidrunconfiguration.h>
-
-#include <projectexplorer/runconfiguration.h>
-
-#include <qmakeprojectmanager/qmakeprojectmanagerconstants.h>
-
 using namespace ProjectExplorer;
 
 namespace QmakeAndroidSupport {
 namespace Internal {
 
-class QmakeAndroidRunConfigurationFactory : public RunConfigurationFactory
-{
-public:
-    QmakeAndroidRunConfigurationFactory()
-    {
-        registerRunConfiguration<Android::AndroidRunConfiguration>
-                ("Qt4ProjectManager.AndroidRunConfiguration:");
-        addSupportedProjectType(QmakeProjectManager::Constants::QMAKEPROJECT_ID);
-        addSupportedTargetDeviceType(Android::Constants::ANDROID_DEVICE_TYPE);
-    }
-};
-
 class QmakeAndroidSupportPluginPrivate
 {
 public:
     AndroidQmakeBuildConfigurationFactory buildConfigFactory;
     QmakeAndroidBuildApkStepFactory buildApkStepFactory;
-    QmakeAndroidRunConfigurationFactory runConfigFactory;
     QmakeAndroidSupport androidSupport;
 };