diff options
| author | hjk <[email protected]> | 2019-01-18 11:32:53 +0100 |
|---|---|---|
| committer | hjk <[email protected]> | 2019-01-21 12:05:28 +0000 |
| commit | 372fbf9c05a5fc8e0c55e9aaf51b413c4fe27eff (patch) | |
| tree | 5c762c004bb121f2feafb07e9565605d14e31289 /src/plugins/android/androiddeployqtstep.cpp | |
| parent | 910496130cfc3d68ff6b7ae992f8cffe6d49b6da (diff) | |
Use new DeployConfigurationFactory::addInitialStep in some cases
Less code, less classes.
Change-Id: I3ba9920f4f389e14c67cd8c5d937a4b4659865e7
Reviewed-by: Christian Kandeler <[email protected]>
Diffstat (limited to 'src/plugins/android/androiddeployqtstep.cpp')
| -rw-r--r-- | src/plugins/android/androiddeployqtstep.cpp | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/plugins/android/androiddeployqtstep.cpp b/src/plugins/android/androiddeployqtstep.cpp index 8a681f7b281..cc80af4a31f 100644 --- a/src/plugins/android/androiddeployqtstep.cpp +++ b/src/plugins/android/androiddeployqtstep.cpp @@ -72,7 +72,6 @@ const QLatin1String InstallFailedInconsistentCertificatesString("INSTALL_PARSE_F const QLatin1String InstallFailedUpdateIncompatible("INSTALL_FAILED_UPDATE_INCOMPATIBLE"); const QLatin1String InstallFailedPermissionModelDowngrade("INSTALL_FAILED_PERMISSION_MODEL_DOWNGRADE"); const QLatin1String InstallFailedVersionDowngrade("INSTALL_FAILED_VERSION_DOWNGRADE"); -const Core::Id AndroidDeployQtStep::Id("Qt4ProjectManager.AndroidDeployQtStep"); static const char *qmlProjectRunConfigIdName = "QmlProjectManager.QmlRunConfiguration"; @@ -80,7 +79,7 @@ static const char *qmlProjectRunConfigIdName = "QmlProjectManager.QmlRunConfigur AndroidDeployQtStepFactory::AndroidDeployQtStepFactory() { - registerStep<AndroidDeployQtStep>(AndroidDeployQtStep::Id); + registerStep<AndroidDeployQtStep>(AndroidDeployQtStep::stepId()); setSupportedStepList(ProjectExplorer::Constants::BUILDSTEPS_DEPLOY); setSupportedDeviceType(Constants::ANDROID_DEVICE_TYPE); setRepeatable(false); @@ -90,7 +89,7 @@ AndroidDeployQtStepFactory::AndroidDeployQtStepFactory() // AndroidDeployQtStep AndroidDeployQtStep::AndroidDeployQtStep(ProjectExplorer::BuildStepList *parent) - : ProjectExplorer::BuildStep(parent, Id) + : ProjectExplorer::BuildStep(parent, stepId()) { setImmutable(true); m_uninstallPreviousPackage = QtSupport::QtKitInformation::qtVersion(target()->kit())->qtVersion() < QtSupport::QtVersionNumber(5, 4, 0); @@ -106,6 +105,11 @@ AndroidDeployQtStep::AndroidDeployQtStep(ProjectExplorer::BuildStepList *parent) this, &AndroidDeployQtStep::slotSetSerialNumber); } +Core::Id AndroidDeployQtStep::stepId() +{ + return "Qt4ProjectManager.AndroidDeployQtStep"; +} + bool AndroidDeployQtStep::init() { m_androiddeployqtArgs.clear(); |