diff options
author | hjk <hjk@qt.io> | 2019-01-18 13:37:16 +0100 |
---|---|---|
committer | hjk <hjk@qt.io> | 2019-01-22 09:21:52 +0000 |
commit | 8f7211b1c677b24cfa923d8e9796ad511ef658b6 (patch) | |
tree | 9bd145adbb59207025273e1bbbe3f7106cb35428 /src/plugins/winrt | |
parent | bb5fdc70fa5fe7fb8ef6852399ee9e454052b1a1 (diff) | |
download | qt-creator-8f7211b1c677b24cfa923d8e9796ad511ef658b6.tar.gz |
ProjectExplorer: Remove DeployConfiguration::initialize
... and adapt remaining users.
The function is now not needed anymore, all setup from the factory.
Change-Id: Ibe77c3e55265309064bc8b840fd1129368cc70c1
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'src/plugins/winrt')
-rw-r--r-- | src/plugins/winrt/winrtdeployconfiguration.cpp | 27 |
1 files changed, 6 insertions, 21 deletions
diff --git a/src/plugins/winrt/winrtdeployconfiguration.cpp b/src/plugins/winrt/winrtdeployconfiguration.cpp index a169305173..189e978373 100644 --- a/src/plugins/winrt/winrtdeployconfiguration.cpp +++ b/src/plugins/winrt/winrtdeployconfiguration.cpp @@ -39,46 +39,31 @@ using namespace ProjectExplorer; namespace WinRt { namespace Internal { -struct WinRtAppDeployConfiguration : DeployConfiguration -{ - WinRtAppDeployConfiguration(Target *target, Core::Id id) : DeployConfiguration(target, id) {} - void initialize() { stepList()->appendStep(new WinRtPackageDeploymentStep(stepList())); } -}; - WinRtAppDeployConfigurationFactory::WinRtAppDeployConfigurationFactory() { - registerDeployConfiguration<WinRtAppDeployConfiguration>("WinRTAppxDeployConfiguration"); + registerDeployConfiguration<DeployConfiguration>("WinRTAppxDeployConfiguration"); setDefaultDisplayName(QCoreApplication::translate("WinRt::Internal::WinRtDeployConfiguration", "Run windeployqt")); addSupportedTargetDeviceType(Constants::WINRT_DEVICE_TYPE_LOCAL); + addInitialStep(Constants::WINRT_BUILD_STEP_DEPLOY); } -struct WinRtPhoneDeployConfiguration : DeployConfiguration -{ - WinRtPhoneDeployConfiguration(Target *target, Core::Id id) : DeployConfiguration(target, id) {} - void initialize() { stepList()->appendStep(new WinRtPackageDeploymentStep(stepList())); } -}; - WinRtPhoneDeployConfigurationFactory::WinRtPhoneDeployConfigurationFactory() { - registerDeployConfiguration<WinRtPhoneDeployConfiguration>("WinRTPhoneDeployConfiguration"); + registerDeployConfiguration<DeployConfiguration>("WinRTPhoneDeployConfiguration"); setDefaultDisplayName(QCoreApplication::translate("WinRt::Internal::WinRtDeployConfiguration", "Deploy to Windows Phone")); addSupportedTargetDeviceType(Constants::WINRT_DEVICE_TYPE_PHONE); + addInitialStep(Constants::WINRT_BUILD_STEP_DEPLOY); } -struct WinRtEmulatorDeployConfiguration : DeployConfiguration -{ - WinRtEmulatorDeployConfiguration(Target *target, Core::Id id) : DeployConfiguration(target, id) {} - void initialize() { stepList()->appendStep(new WinRtPackageDeploymentStep(stepList())); } -}; - WinRtEmulatorDeployConfigurationFactory::WinRtEmulatorDeployConfigurationFactory() { - registerDeployConfiguration<WinRtEmulatorDeployConfiguration>("WinRTEmulatorDeployConfiguration"); + registerDeployConfiguration<DeployConfiguration>("WinRTEmulatorDeployConfiguration"); setDefaultDisplayName(QCoreApplication::translate("WinRt::Internal::WinRtDeployConfiguration", "Deploy to Windows Phone Emulator")); addSupportedTargetDeviceType(Constants::WINRT_DEVICE_TYPE_EMULATOR); + addInitialStep(Constants::WINRT_BUILD_STEP_DEPLOY); } WinRtDeployStepFactory::WinRtDeployStepFactory() |