diff options
| author | hjk <[email protected]> | 2019-01-24 17:27:50 +0100 |
|---|---|---|
| committer | hjk <[email protected]> | 2019-01-25 13:09:06 +0000 |
| commit | ee483abdb6fcec31d3a3da944cca410e291d8e56 (patch) | |
| tree | c4cd7b2702f2ee2940b9e88d7a48bdf77108d60d /src/plugins/android/androidplugin.cpp | |
| parent | 678112c6fd76afa68216845c4e8dc86708050e63 (diff) | |
Android: Remove DeployConfiguration restriction
... to matching Qt and tool chain.
This is the only remaining place in Creator that refuses to restore
deploy configurations in such cases, and arguably there's no point
in dropping such a configuration as a whole, the individual steps
(i.e. AndroidDeployQtStep) can and do chicken out at deploy time
if there's no Qt version in reach.
Also move AndroidDeployConfigurationFactory to the plugin.cpp,
no need for a .cpp/.h pair for the remaining few lines.
Change-Id: If6ea7cf9573149c88c05629997ac582dc90d1e48
Reviewed-by: Christian Kandeler <[email protected]>
Diffstat (limited to 'src/plugins/android/androidplugin.cpp')
| -rw-r--r-- | src/plugins/android/androidplugin.cpp | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/src/plugins/android/androidplugin.cpp b/src/plugins/android/androidplugin.cpp index 7fdb28cad52..2b19da438f6 100644 --- a/src/plugins/android/androidplugin.cpp +++ b/src/plugins/android/androidplugin.cpp @@ -28,7 +28,6 @@ #include "androidconfigurations.h" #include "androidconstants.h" #include "androiddebugsupport.h" -#include "androiddeployconfiguration.h" #include "androiddeployqtstep.h" #include "androiddevice.h" #include "androiddevicefactory.h" @@ -51,6 +50,7 @@ #include <projectexplorer/devicesupport/devicemanager.h> #include <projectexplorer/buildconfiguration.h> +#include <projectexplorer/deployconfiguration.h> #include <projectexplorer/kitinformation.h> #include <projectexplorer/kitmanager.h> #include <projectexplorer/project.h> @@ -65,6 +65,19 @@ using namespace ProjectExplorer::Constants; namespace Android { namespace Internal { +class AndroidDeployConfigurationFactory : public DeployConfigurationFactory +{ +public: + AndroidDeployConfigurationFactory() + { + setConfigBaseId("Qt4ProjectManager.AndroidDeployConfiguration2"); + addSupportedTargetDeviceType(Constants::ANDROID_DEVICE_TYPE); + setDefaultDisplayName(QCoreApplication::translate("Android::Internal", + "Deploy to Android device")); + addInitialStep(AndroidDeployQtStep::stepId()); + } +}; + class AndroidRunConfigurationFactory : public RunConfigurationFactory { public: |