forked from qt-creator/qt-creator
iOS: Use a constant from iosconstant.h as deploy step id
Not really a big win here, but in line with what most others do. Change-Id: I19f100084c8ca4cc7d0de97125efdc519bdfc972 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
@@ -43,6 +43,7 @@ const char IOS_DEVICE_ID[] = "iOS Device ";
|
||||
const char IOS_SIMULATOR_DEVICE_ID[] = "iOS Simulator Device ";
|
||||
const char IOS_PRESET_BUILD_STEP_ID[] = "Ios.IosPresetBuildStep";
|
||||
const char IOS_DSYM_BUILD_STEP_ID[] = "Ios.IosDsymBuildStep";
|
||||
const char IOS_DEPLOY_STEP_ID[] = "Qt4ProjectManager.IosDeployStep";
|
||||
|
||||
const char IosTarget[] = "IosTarget"; // QString
|
||||
const char IosBuildDir[] = "IosBuildDir"; // QString
|
||||
|
@@ -315,17 +315,12 @@ IosSimulator::ConstPtr IosDeployStep::iossimulator() const
|
||||
|
||||
IosDeployStepFactory::IosDeployStepFactory()
|
||||
{
|
||||
registerStep<IosDeployStep>(stepId());
|
||||
registerStep<IosDeployStep>(Constants::IOS_DEPLOY_STEP_ID);
|
||||
setDisplayName(IosDeployStep::tr("Deploy to iOS device or emulator"));
|
||||
setSupportedStepList(ProjectExplorer::Constants::BUILDSTEPS_DEPLOY);
|
||||
setSupportedDeviceTypes({Constants::IOS_DEVICE_TYPE, Constants::IOS_SIMULATOR_TYPE});
|
||||
setRepeatable(false);
|
||||
}
|
||||
|
||||
Utils::Id IosDeployStepFactory::stepId()
|
||||
{
|
||||
return "Qt4ProjectManager.IosDeployStep";
|
||||
}
|
||||
|
||||
} // namespace Internal
|
||||
} // namespace Ios
|
||||
|
@@ -34,8 +34,6 @@ class IosDeployStepFactory final : public ProjectExplorer::BuildStepFactory
|
||||
{
|
||||
public:
|
||||
IosDeployStepFactory();
|
||||
|
||||
static Utils::Id stepId();
|
||||
};
|
||||
|
||||
} // namespace Internal
|
||||
|
@@ -63,7 +63,7 @@ public:
|
||||
addSupportedTargetDeviceType(Constants::IOS_DEVICE_TYPE);
|
||||
addSupportedTargetDeviceType(Constants::IOS_SIMULATOR_TYPE);
|
||||
setDefaultDisplayName(QCoreApplication::translate("Ios::Internal", "Deploy on iOS"));
|
||||
addInitialStep(IosDeployStepFactory::stepId());
|
||||
addInitialStep(Constants::IOS_DEPLOY_STEP_ID);
|
||||
}
|
||||
};
|
||||
|
||||
|
Reference in New Issue
Block a user