diff --git a/src/plugins/android/androiddeployconfiguration.cpp b/src/plugins/android/androiddeployconfiguration.cpp index faf4ed6ec29..ab276e54083 100644 --- a/src/plugins/android/androiddeployconfiguration.cpp +++ b/src/plugins/android/androiddeployconfiguration.cpp @@ -47,6 +47,9 @@ using namespace ProjectExplorer; namespace Android { namespace Internal { +// Qt 5.2 has a new form of deployment +const char ANDROID_DEPLOYCONFIGURATION_ID[] = "Qt4ProjectManager.AndroidDeployConfiguration2"; + AndroidDeployConfiguration::AndroidDeployConfiguration(Target *parent, Core::Id id) : DeployConfiguration(parent, id) { diff --git a/src/plugins/android/androiddeployconfiguration.h b/src/plugins/android/androiddeployconfiguration.h index 1b972949c93..852c3b6447a 100644 --- a/src/plugins/android/androiddeployconfiguration.h +++ b/src/plugins/android/androiddeployconfiguration.h @@ -36,10 +36,6 @@ namespace Android { namespace Internal { -// Qt 5.2 has a new form of deployment -const char ANDROID_DEPLOYCONFIGURATION_ID[] = "Qt4ProjectManager.AndroidDeployConfiguration2"; -const char ANDROID_DC_PREFIX[] = "Qt4ProjectManager.AndroidDeployConfiguration2."; - class AndroidDeployConfiguration : public ProjectExplorer::DeployConfiguration { Q_OBJECT diff --git a/src/plugins/baremetal/baremetalgdbcommandsdeploystep.cpp b/src/plugins/baremetal/baremetalgdbcommandsdeploystep.cpp index cbd895fd910..6bcb3ff7d52 100644 --- a/src/plugins/baremetal/baremetalgdbcommandsdeploystep.cpp +++ b/src/plugins/baremetal/baremetalgdbcommandsdeploystep.cpp @@ -37,6 +37,8 @@ using namespace ProjectExplorer; namespace BareMetal { namespace Internal { +const char GdbCommandsKey[] = "BareMetal.GdbCommandsStep.Commands"; + BareMetalGdbCommandsDeployStepWidget::BareMetalGdbCommandsDeployStepWidget(BareMetalGdbCommandsDeployStep &step) : m_step(step) { diff --git a/src/plugins/baremetal/baremetalgdbcommandsdeploystep.h b/src/plugins/baremetal/baremetalgdbcommandsdeploystep.h index 2eb6cfc6f03..77ebc4eb61d 100644 --- a/src/plugins/baremetal/baremetalgdbcommandsdeploystep.h +++ b/src/plugins/baremetal/baremetalgdbcommandsdeploystep.h @@ -68,8 +68,6 @@ private: QString m_gdbCommands; }; -const char GdbCommandsKey[] = "BareMetal.GdbCommandsStep.Commands"; - class BareMetalGdbCommandsDeployStepWidget: public ProjectExplorer::BuildStepConfigWidget { Q_OBJECT diff --git a/src/plugins/ios/iosdeployconfiguration.cpp b/src/plugins/ios/iosdeployconfiguration.cpp index 437275bbfdc..72d9d417f19 100644 --- a/src/plugins/ios/iosdeployconfiguration.cpp +++ b/src/plugins/ios/iosdeployconfiguration.cpp @@ -45,6 +45,9 @@ using namespace ProjectExplorer; namespace Ios { namespace Internal { +const char IOS_DEPLOYCONFIGURATION_ID[] = "Qt4ProjectManager.IosDeployConfiguration"; +const char IOS_DC_PREFIX[] = "Qt4ProjectManager.IosDeployConfiguration."; + IosDeployConfiguration::IosDeployConfiguration(Target *parent, Core::Id id) : DeployConfiguration(parent, id) { diff --git a/src/plugins/ios/iosdeployconfiguration.h b/src/plugins/ios/iosdeployconfiguration.h index 1a0df803514..9f0dc01e5ea 100644 --- a/src/plugins/ios/iosdeployconfiguration.h +++ b/src/plugins/ios/iosdeployconfiguration.h @@ -35,9 +35,6 @@ namespace Ios { namespace Internal { -const char IOS_DEPLOYCONFIGURATION_ID[] = "Qt4ProjectManager.IosDeployConfiguration"; -const char IOS_DC_PREFIX[] = "Qt4ProjectManager.IosDeployConfiguration."; - class IosDeployConfiguration : public ProjectExplorer::DeployConfiguration { Q_OBJECT