feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QmakeAndroid: Move RunConfigurationFactory to Android base

Browse Source 
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>
This commit is contained in:
hjk
2018-05-16 09:34:54 +02:00
parent 59f864a758
commit 82fd4fa717
2 changed files with 12 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/plugins/android/androidplugin.cpp
View File

@@ -62,6 +62,17 @@ using namespace ProjectExplorer::Constants;
namespace Android { namespace Android {
namespace Internal { namespace Internal {
class AndroidRunConfigurationFactory : public RunConfigurationFactory
{
public:
AndroidRunConfigurationFactory()
{
registerRunConfiguration<Android::AndroidRunConfiguration>
("Qt4ProjectManager.AndroidRunConfiguration:");
addSupportedTargetDeviceType(Android::Constants::ANDROID_DEVICE_TYPE);
}
};
class AndroidPluginPrivate class AndroidPluginPrivate
{ {
public: public:
@@ -76,6 +87,7 @@ public:
JavaEditorFactory javaEditorFactory; JavaEditorFactory javaEditorFactory;
AndroidPackageInstallationFactory packackeInstallationFactory; AndroidPackageInstallationFactory packackeInstallationFactory;
AndroidManifestEditorFactory manifestEditorFactory; AndroidManifestEditorFactory manifestEditorFactory;
AndroidRunConfigurationFactory runConfigFactory;
}; };
AndroidPlugin::~AndroidPlugin() AndroidPlugin::~AndroidPlugin()

20
src/plugins/qmakeandroidsupport/qmakeandroidsupportplugin.cpp
View File

@@ -29,36 +29,16 @@
#include "qmakeandroidbuildapkstep.h" #include "qmakeandroidbuildapkstep.h"
#include "qmakeandroidsupport.h" #include "qmakeandroidsupport.h"
#include <android/androidconstants.h>
#include <android/androidrunconfiguration.h>
#include <projectexplorer/runconfiguration.h>
#include <qmakeprojectmanager/qmakeprojectmanagerconstants.h>
using namespace ProjectExplorer; using namespace ProjectExplorer;
namespace QmakeAndroidSupport { namespace QmakeAndroidSupport {
namespace Internal { 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 class QmakeAndroidSupportPluginPrivate
{ {
public: public:
AndroidQmakeBuildConfigurationFactory buildConfigFactory; AndroidQmakeBuildConfigurationFactory buildConfigFactory;
QmakeAndroidBuildApkStepFactory buildApkStepFactory; QmakeAndroidBuildApkStepFactory buildApkStepFactory;
QmakeAndroidRunConfigurationFactory runConfigFactory;
QmakeAndroidSupport androidSupport; QmakeAndroidSupport androidSupport;
}; };