summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorhjk <hjk@qt.io>2018-05-14 17:50:56 +0200
committerhjk <hjk@qt.io>2018-05-31 10:15:42 +0000
commitf44e73b858af7d67b9c855469bee71927ba3f86b (patch)
tree7156c74edf440aaa2d9b9f778e6e5f2fd9ade04f /src
parent4feb2259d93dc666d41582ae63aa4b7499ef86a5 (diff)
downloadqt-creator-f44e73b858af7d67b9c855469bee71927ba3f86b.tar.gz
ProjectExplorer: Simplify BuildStepFactory
De-QObject-ify class, tr contexts are now the product's context, which was the case in some BuildStepFactories already, and is current state in {Run,DeployConfiguration}Factory. One spurious object name removed. De-virtualize canHandle(), it was never overloaded and is not intended to be overloaded anymore. Remove unused clone() function. Change-Id: Iff7fba5f707505f868f94458084a18650535fa23 Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
Diffstat (limited to 'src')
-rw-r--r--src/plugins/android/androiddeployqtstep.cpp2
-rw-r--r--src/plugins/android/androiddeployqtstep.h1
-rw-r--r--src/plugins/android/androidpackageinstallationstep.cpp2
-rw-r--r--src/plugins/android/androidpackageinstallationstep.h2
-rw-r--r--src/plugins/autotoolsprojectmanager/autogenstep.cpp2
-rw-r--r--src/plugins/autotoolsprojectmanager/autogenstep.h2
-rw-r--r--src/plugins/autotoolsprojectmanager/autoreconfstep.cpp2
-rw-r--r--src/plugins/autotoolsprojectmanager/autoreconfstep.h2
-rw-r--r--src/plugins/autotoolsprojectmanager/configurestep.cpp2
-rw-r--r--src/plugins/autotoolsprojectmanager/configurestep.h2
-rw-r--r--src/plugins/autotoolsprojectmanager/makestep.cpp1
-rw-r--r--src/plugins/autotoolsprojectmanager/makestep.h2
-rw-r--r--src/plugins/cmakeprojectmanager/cmakebuildstep.cpp2
-rw-r--r--src/plugins/cmakeprojectmanager/cmakebuildstep.h2
-rw-r--r--src/plugins/ios/iosdeploystepfactory.cpp2
-rw-r--r--src/plugins/ios/iosdeploystepfactory.h2
-rw-r--r--src/plugins/ios/iosdsymbuildstep.h1
-rw-r--r--src/plugins/nim/project/nimcompilerbuildstep.cpp2
-rw-r--r--src/plugins/nim/project/nimcompilercleanstep.cpp2
-rw-r--r--src/plugins/projectexplorer/buildstep.h11
-rw-r--r--src/plugins/projectexplorer/processstep.h2
-rw-r--r--src/plugins/qbsprojectmanager/qbsbuildstep.cpp2
-rw-r--r--src/plugins/qbsprojectmanager/qbsbuildstep.h2
-rw-r--r--src/plugins/qbsprojectmanager/qbscleanstep.cpp2
-rw-r--r--src/plugins/qbsprojectmanager/qbscleanstep.h2
-rw-r--r--src/plugins/qbsprojectmanager/qbsinstallstep.cpp2
-rw-r--r--src/plugins/qbsprojectmanager/qbsinstallstep.h2
-rw-r--r--src/plugins/qmakeandroidsupport/qmakeandroidbuildapkstep.cpp2
-rw-r--r--src/plugins/qmakeandroidsupport/qmakeandroidbuildapkstep.h2
-rw-r--r--src/plugins/qmakeprojectmanager/qmakemakestep.h2
-rw-r--r--src/plugins/qmakeprojectmanager/qmakestep.cpp2
-rw-r--r--src/plugins/qmakeprojectmanager/qmakestep.h3
32 files changed, 20 insertions, 51 deletions
diff --git a/src/plugins/android/androiddeployqtstep.cpp b/src/plugins/android/androiddeployqtstep.cpp
index 78166ffea3..a9cbe00fdf 100644
--- a/src/plugins/android/androiddeployqtstep.cpp
+++ b/src/plugins/android/androiddeployqtstep.cpp
@@ -77,7 +77,7 @@ AndroidDeployQtStepFactory::AndroidDeployQtStepFactory()
setSupportedStepList(ProjectExplorer::Constants::BUILDSTEPS_DEPLOY);
setSupportedDeviceType(Constants::ANDROID_DEVICE_TYPE);
setRepeatable(false);
- setDisplayName(tr("Deploy to Android device or emulator"));
+ setDisplayName(AndroidDeployQtStep::tr("Deploy to Android device or emulator"));
}
// AndroidDeployQtStep
diff --git a/src/plugins/android/androiddeployqtstep.h b/src/plugins/android/androiddeployqtstep.h
index 4b5534fda5..fcdff97253 100644
--- a/src/plugins/android/androiddeployqtstep.h
+++ b/src/plugins/android/androiddeployqtstep.h
@@ -43,7 +43,6 @@ namespace Internal {
class AndroidDeployQtStepFactory : public ProjectExplorer::BuildStepFactory
{
- Q_OBJECT
public:
AndroidDeployQtStepFactory();
};
diff --git a/src/plugins/android/androidpackageinstallationstep.cpp b/src/plugins/android/androidpackageinstallationstep.cpp
index fa69951e82..3148fbc42d 100644
--- a/src/plugins/android/androidpackageinstallationstep.cpp
+++ b/src/plugins/android/androidpackageinstallationstep.cpp
@@ -155,7 +155,7 @@ AndroidPackageInstallationFactory::AndroidPackageInstallationFactory()
setSupportedStepList(ProjectExplorer::Constants::BUILDSTEPS_BUILD);
setSupportedDeviceType(Android::Constants::ANDROID_DEVICE_TYPE);
setRepeatable(false);
- setDisplayName(tr("Deploy to device"));
+ setDisplayName(AndroidPackageInstallationStep::tr("Deploy to device"));
}
} // namespace Internal
diff --git a/src/plugins/android/androidpackageinstallationstep.h b/src/plugins/android/androidpackageinstallationstep.h
index bf0a4653b8..40174ef1c6 100644
--- a/src/plugins/android/androidpackageinstallationstep.h
+++ b/src/plugins/android/androidpackageinstallationstep.h
@@ -68,8 +68,6 @@ private:
class AndroidPackageInstallationFactory: public ProjectExplorer::BuildStepFactory
{
- Q_OBJECT
-
public:
AndroidPackageInstallationFactory();
};
diff --git a/src/plugins/autotoolsprojectmanager/autogenstep.cpp b/src/plugins/autotoolsprojectmanager/autogenstep.cpp
index 0106a435b8..3bcb90d052 100644
--- a/src/plugins/autotoolsprojectmanager/autogenstep.cpp
+++ b/src/plugins/autotoolsprojectmanager/autogenstep.cpp
@@ -56,7 +56,7 @@ const char AUTOGEN_STEP_ID[] = "AutotoolsProjectManager.AutogenStep";
AutogenStepFactory::AutogenStepFactory()
{
registerStep<AutogenStep>(AUTOGEN_STEP_ID);
- setDisplayName(tr("Autogen", "Display name for AutotoolsProjectManager::AutogenStep id."));
+ setDisplayName(AutogenStep::tr("Autogen", "Display name for AutotoolsProjectManager::AutogenStep id."));
setSupportedProjectType(Constants::AUTOTOOLS_PROJECT_ID);
setSupportedStepList(ProjectExplorer::Constants::BUILDSTEPS_BUILD);
}
diff --git a/src/plugins/autotoolsprojectmanager/autogenstep.h b/src/plugins/autotoolsprojectmanager/autogenstep.h
index 320c0bacaf..a4659ebcbc 100644
--- a/src/plugins/autotoolsprojectmanager/autogenstep.h
+++ b/src/plugins/autotoolsprojectmanager/autogenstep.h
@@ -50,8 +50,6 @@ class AutogenStepConfigWidget;
*/
class AutogenStepFactory : public ProjectExplorer::BuildStepFactory
{
- Q_OBJECT
-
public:
AutogenStepFactory();
};
diff --git a/src/plugins/autotoolsprojectmanager/autoreconfstep.cpp b/src/plugins/autotoolsprojectmanager/autoreconfstep.cpp
index 473e587d78..51e2e34751 100644
--- a/src/plugins/autotoolsprojectmanager/autoreconfstep.cpp
+++ b/src/plugins/autotoolsprojectmanager/autoreconfstep.cpp
@@ -55,7 +55,7 @@ const char AUTORECONF_ADDITIONAL_ARGUMENTS_KEY[] = "AutotoolsProjectManager.Auto
AutoreconfStepFactory::AutoreconfStepFactory()
{
registerStep<AutoreconfStep>(AUTORECONF_STEP_ID);
- setDisplayName(tr("Autoreconf", "Display name for AutotoolsProjectManager::AutoreconfStep id."));
+ setDisplayName(AutoreconfStep::tr("Autoreconf", "Display name for AutotoolsProjectManager::AutoreconfStep id."));
setSupportedProjectType(Constants::AUTOTOOLS_PROJECT_ID);
setSupportedStepList(ProjectExplorer::Constants::BUILDSTEPS_BUILD);
}
diff --git a/src/plugins/autotoolsprojectmanager/autoreconfstep.h b/src/plugins/autotoolsprojectmanager/autoreconfstep.h
index 160f6fc5c1..7aa345c148 100644
--- a/src/plugins/autotoolsprojectmanager/autoreconfstep.h
+++ b/src/plugins/autotoolsprojectmanager/autoreconfstep.h
@@ -49,8 +49,6 @@ class AutoreconfStep;
*/
class AutoreconfStepFactory : public ProjectExplorer::BuildStepFactory
{
- Q_OBJECT
-
public:
AutoreconfStepFactory();
};
diff --git a/src/plugins/autotoolsprojectmanager/configurestep.cpp b/src/plugins/autotoolsprojectmanager/configurestep.cpp
index 7d370e2ded..5ae119553d 100644
--- a/src/plugins/autotoolsprojectmanager/configurestep.cpp
+++ b/src/plugins/autotoolsprojectmanager/configurestep.cpp
@@ -70,7 +70,7 @@ static QString projectDirRelativeToBuildDir(BuildConfiguration *bc) {
ConfigureStepFactory::ConfigureStepFactory()
{
registerStep<ConfigureStep>(CONFIGURE_STEP_ID);
- setDisplayName(tr("Configure", "Display name for AutotoolsProjectManager::ConfigureStep id."));
+ setDisplayName(ConfigureStep::tr("Configure", "Display name for AutotoolsProjectManager::ConfigureStep id."));
setSupportedProjectType(Constants::AUTOTOOLS_PROJECT_ID);
setSupportedStepList(ProjectExplorer::Constants::BUILDSTEPS_BUILD);
}
diff --git a/src/plugins/autotoolsprojectmanager/configurestep.h b/src/plugins/autotoolsprojectmanager/configurestep.h
index 2f5ce3e65e..0ab97fbae3 100644
--- a/src/plugins/autotoolsprojectmanager/configurestep.h
+++ b/src/plugins/autotoolsprojectmanager/configurestep.h
@@ -49,8 +49,6 @@ class ConfigureStepConfigWidget;
*/
class ConfigureStepFactory : public ProjectExplorer::BuildStepFactory
{
- Q_OBJECT
-
public:
ConfigureStepFactory();
};
diff --git a/src/plugins/autotoolsprojectmanager/makestep.cpp b/src/plugins/autotoolsprojectmanager/makestep.cpp
index eebef955a2..315d235c9b 100644
--- a/src/plugins/autotoolsprojectmanager/makestep.cpp
+++ b/src/plugins/autotoolsprojectmanager/makestep.cpp
@@ -56,7 +56,6 @@ MakeStepFactory::MakeStepFactory()
}
};
- setObjectName("Autotools::MakeStepFactory");
registerStep<Step>(MAKE_STEP_ID);
setDisplayName(ProjectExplorer::MakeStep::defaultDisplayName());
setSupportedProjectType(AUTOTOOLS_PROJECT_ID);
diff --git a/src/plugins/autotoolsprojectmanager/makestep.h b/src/plugins/autotoolsprojectmanager/makestep.h
index cbc5496529..f738fd1057 100644
--- a/src/plugins/autotoolsprojectmanager/makestep.h
+++ b/src/plugins/autotoolsprojectmanager/makestep.h
@@ -37,8 +37,6 @@ namespace Internal {
///////////////////////////
class MakeStepFactory : public ProjectExplorer::BuildStepFactory
{
- Q_OBJECT
-
public:
MakeStepFactory();
};
diff --git a/src/plugins/cmakeprojectmanager/cmakebuildstep.cpp b/src/plugins/cmakeprojectmanager/cmakebuildstep.cpp
index 186500b03e..6463dcf53e 100644
--- a/src/plugins/cmakeprojectmanager/cmakebuildstep.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakebuildstep.cpp
@@ -555,7 +555,7 @@ QString CMakeBuildStepConfigWidget::summaryText() const
CMakeBuildStepFactory::CMakeBuildStepFactory()
{
registerStep<CMakeBuildStep>(Constants::CMAKE_BUILD_STEP_ID);
- setDisplayName(tr("Build", "Display name for CMakeProjectManager::CMakeBuildStep id."));
+ setDisplayName(CMakeBuildStep::tr("Build", "Display name for CMakeProjectManager::CMakeBuildStep id."));
setSupportedProjectType(Constants::CMAKEPROJECT_ID);
}
diff --git a/src/plugins/cmakeprojectmanager/cmakebuildstep.h b/src/plugins/cmakeprojectmanager/cmakebuildstep.h
index 855f582d81..098310f1eb 100644
--- a/src/plugins/cmakeprojectmanager/cmakebuildstep.h
+++ b/src/plugins/cmakeprojectmanager/cmakebuildstep.h
@@ -138,8 +138,6 @@ private:
class CMakeBuildStepFactory : public ProjectExplorer::BuildStepFactory
{
- Q_OBJECT
-
public:
CMakeBuildStepFactory();
};
diff --git a/src/plugins/ios/iosdeploystepfactory.cpp b/src/plugins/ios/iosdeploystepfactory.cpp
index b6a3506e91..cb748edd94 100644
--- a/src/plugins/ios/iosdeploystepfactory.cpp
+++ b/src/plugins/ios/iosdeploystepfactory.cpp
@@ -36,7 +36,7 @@ namespace Internal {
IosDeployStepFactory::IosDeployStepFactory()
{
registerStep<IosDeployStep>(IosDeployStep::Id);
- setDisplayName(tr("Deploy to iOS device or emulator"));
+ 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);
diff --git a/src/plugins/ios/iosdeploystepfactory.h b/src/plugins/ios/iosdeploystepfactory.h
index 73d01f0599..d94a79f57f 100644
--- a/src/plugins/ios/iosdeploystepfactory.h
+++ b/src/plugins/ios/iosdeploystepfactory.h
@@ -32,8 +32,6 @@ namespace Internal {
class IosDeployStepFactory : public ProjectExplorer::BuildStepFactory
{
- Q_OBJECT
-
public:
IosDeployStepFactory();
};
diff --git a/src/plugins/ios/iosdsymbuildstep.h b/src/plugins/ios/iosdsymbuildstep.h
index 39d01ef667..58200826f2 100644
--- a/src/plugins/ios/iosdsymbuildstep.h
+++ b/src/plugins/ios/iosdsymbuildstep.h
@@ -90,7 +90,6 @@ private:
class IosDsymBuildStepFactory : public ProjectExplorer::BuildStepFactory
{
- Q_OBJECT
public:
explicit IosDsymBuildStepFactory();
};
diff --git a/src/plugins/nim/project/nimcompilerbuildstep.cpp b/src/plugins/nim/project/nimcompilerbuildstep.cpp
index 9f27b73ddf..de081f04a1 100644
--- a/src/plugins/nim/project/nimcompilerbuildstep.cpp
+++ b/src/plugins/nim/project/nimcompilerbuildstep.cpp
@@ -290,7 +290,7 @@ void NimCompilerBuildStep::updateTargetNimFile()
NimCompilerBuildStepFactory::NimCompilerBuildStepFactory()
{
registerStep<NimCompilerBuildStep>(Constants::C_NIMCOMPILERBUILDSTEP_ID);
- setDisplayName(tr("Nim Compiler Build Step"));
+ setDisplayName(NimCompilerBuildStep::tr("Nim Compiler Build Step"));
setSupportedStepList(ProjectExplorer::Constants::BUILDSTEPS_BUILD);
setSupportedConfiguration(Constants::C_NIMBUILDCONFIGURATION_ID);
setRepeatable(false);
diff --git a/src/plugins/nim/project/nimcompilercleanstep.cpp b/src/plugins/nim/project/nimcompilercleanstep.cpp
index bd9eaf4edb..f3fac15081 100644
--- a/src/plugins/nim/project/nimcompilercleanstep.cpp
+++ b/src/plugins/nim/project/nimcompilercleanstep.cpp
@@ -117,7 +117,7 @@ NimCompilerCleanStepFactory::NimCompilerCleanStepFactory()
setSupportedStepList(ProjectExplorer::Constants::BUILDSTEPS_CLEAN);
setSupportedConfiguration(Constants::C_NIMBUILDCONFIGURATION_ID);
setRepeatable(false);
- setDisplayName(tr(Nim::Constants::C_NIMCOMPILERCLEANSTEP_DISPLAY));
+ setDisplayName(NimCompilerCleanStep::tr(Nim::Constants::C_NIMCOMPILERCLEANSTEP_DISPLAY));
}
} // Nim
diff --git a/src/plugins/projectexplorer/buildstep.h b/src/plugins/projectexplorer/buildstep.h
index dd68e52216..d6e685735b 100644
--- a/src/plugins/projectexplorer/buildstep.h
+++ b/src/plugins/projectexplorer/buildstep.h
@@ -118,13 +118,11 @@ public:
BuildStepCreator creator;
};
-class PROJECTEXPLORER_EXPORT BuildStepFactory : public QObject
+class PROJECTEXPLORER_EXPORT BuildStepFactory
{
- Q_OBJECT
-
public:
BuildStepFactory();
- ~BuildStepFactory() override;
+ virtual ~BuildStepFactory();
static const QList<BuildStepFactory *> allBuildStepFactories();
@@ -133,9 +131,12 @@ public:
BuildStep *create(BuildStepList *parent, Core::Id id);
BuildStep *restore(BuildStepList *parent, const QVariantMap &map);
- virtual bool canHandle(BuildStepList *bsl) const;
+ bool canHandle(BuildStepList *bsl) const;
protected:
+ BuildStepFactory(const BuildStepFactory &) = delete;
+ BuildStepFactory &operator=(const BuildStepFactory &) = delete;
+
using BuildStepCreator = std::function<BuildStep *(BuildStepList *)>;
template <class BuildStepType>
diff --git a/src/plugins/projectexplorer/processstep.h b/src/plugins/projectexplorer/processstep.h
index 7da9f4ec09..4b61b2f51a 100644
--- a/src/plugins/projectexplorer/processstep.h
+++ b/src/plugins/projectexplorer/processstep.h
@@ -33,8 +33,6 @@ namespace Internal {
class ProcessStepFactory : public BuildStepFactory
{
- Q_OBJECT
-
public:
ProcessStepFactory();
};
diff --git a/src/plugins/qbsprojectmanager/qbsbuildstep.cpp b/src/plugins/qbsprojectmanager/qbsbuildstep.cpp
index a8aa93f060..f5b19f67a0 100644
--- a/src/plugins/qbsprojectmanager/qbsbuildstep.cpp
+++ b/src/plugins/qbsprojectmanager/qbsbuildstep.cpp
@@ -832,7 +832,7 @@ bool QbsBuildStepConfigWidget::validateProperties(Utils::FancyLineEdit *edit, QS
QbsBuildStepFactory::QbsBuildStepFactory()
{
registerStep<QbsBuildStep>(Constants::QBS_BUILDSTEP_ID);
- setDisplayName(tr("Qbs Build"));
+ setDisplayName(QbsBuildStep::tr("Qbs Build"));
setSupportedStepList(ProjectExplorer::Constants::BUILDSTEPS_BUILD);
setSupportedConfiguration(Constants::QBS_BC_ID);
setSupportedProjectType(Constants::PROJECT_ID);
diff --git a/src/plugins/qbsprojectmanager/qbsbuildstep.h b/src/plugins/qbsprojectmanager/qbsbuildstep.h
index f104152627..07076439b6 100644
--- a/src/plugins/qbsprojectmanager/qbsbuildstep.h
+++ b/src/plugins/qbsprojectmanager/qbsbuildstep.h
@@ -143,8 +143,6 @@ private:
class QbsBuildStepFactory : public ProjectExplorer::BuildStepFactory
{
- Q_OBJECT
-
public:
QbsBuildStepFactory();
};
diff --git a/src/plugins/qbsprojectmanager/qbscleanstep.cpp b/src/plugins/qbsprojectmanager/qbscleanstep.cpp
index d928ae317c..3930826dc9 100644
--- a/src/plugins/qbsprojectmanager/qbscleanstep.cpp
+++ b/src/plugins/qbsprojectmanager/qbscleanstep.cpp
@@ -295,7 +295,7 @@ QbsCleanStepFactory::QbsCleanStepFactory()
registerStep<QbsCleanStep>(Constants::QBS_CLEANSTEP_ID);
setSupportedStepList(ProjectExplorer::Constants::BUILDSTEPS_CLEAN);
setSupportedConfiguration(Constants::QBS_BC_ID);
- setDisplayName(tr("Qbs Clean"));
+ setDisplayName(QbsCleanStep::tr("Qbs Clean"));
}
} // namespace Internal
diff --git a/src/plugins/qbsprojectmanager/qbscleanstep.h b/src/plugins/qbsprojectmanager/qbscleanstep.h
index b7f84a1d5b..011e706cbd 100644
--- a/src/plugins/qbsprojectmanager/qbscleanstep.h
+++ b/src/plugins/qbsprojectmanager/qbscleanstep.h
@@ -114,8 +114,6 @@ private:
class QbsCleanStepFactory : public ProjectExplorer::BuildStepFactory
{
- Q_OBJECT
-
public:
QbsCleanStepFactory();
};
diff --git a/src/plugins/qbsprojectmanager/qbsinstallstep.cpp b/src/plugins/qbsprojectmanager/qbsinstallstep.cpp
index 6e590ff209..076ba2bcc9 100644
--- a/src/plugins/qbsprojectmanager/qbsinstallstep.cpp
+++ b/src/plugins/qbsprojectmanager/qbsinstallstep.cpp
@@ -338,7 +338,7 @@ QbsInstallStepFactory::QbsInstallStepFactory()
setSupportedStepList(ProjectExplorer::Constants::BUILDSTEPS_DEPLOY);
setSupportedDeviceType(ProjectExplorer::Constants::DESKTOP_DEVICE_TYPE);
setSupportedProjectType(Constants::PROJECT_ID);
- setDisplayName(tr("Qbs Install"));
+ setDisplayName(QbsInstallStep::tr("Qbs Install"));
}
} // namespace Internal
diff --git a/src/plugins/qbsprojectmanager/qbsinstallstep.h b/src/plugins/qbsprojectmanager/qbsinstallstep.h
index 74e930570a..9d8029d0b9 100644
--- a/src/plugins/qbsprojectmanager/qbsinstallstep.h
+++ b/src/plugins/qbsprojectmanager/qbsinstallstep.h
@@ -119,8 +119,6 @@ private:
class QbsInstallStepFactory : public ProjectExplorer::BuildStepFactory
{
- Q_OBJECT
-
public:
QbsInstallStepFactory();
};
diff --git a/src/plugins/qmakeandroidsupport/qmakeandroidbuildapkstep.cpp b/src/plugins/qmakeandroidsupport/qmakeandroidbuildapkstep.cpp
index 1f409ebd3a..7c7e30ccf1 100644
--- a/src/plugins/qmakeandroidsupport/qmakeandroidbuildapkstep.cpp
+++ b/src/plugins/qmakeandroidsupport/qmakeandroidbuildapkstep.cpp
@@ -59,7 +59,7 @@ QmakeAndroidBuildApkStepFactory::QmakeAndroidBuildApkStepFactory()
setSupportedProjectType(QmakeProjectManager::Constants::QMAKEPROJECT_ID);
setSupportedDeviceType(Constants::ANDROID_DEVICE_TYPE);
setSupportedStepList(ProjectExplorer::Constants::BUILDSTEPS_BUILD);
- setDisplayName(tr("Build Android APK"));
+ setDisplayName(QmakeAndroidBuildApkStep::tr("Build Android APK"));
setRepeatable(false);
}
diff --git a/src/plugins/qmakeandroidsupport/qmakeandroidbuildapkstep.h b/src/plugins/qmakeandroidsupport/qmakeandroidbuildapkstep.h
index 6435a8486a..22eb103a17 100644
--- a/src/plugins/qmakeandroidsupport/qmakeandroidbuildapkstep.h
+++ b/src/plugins/qmakeandroidsupport/qmakeandroidbuildapkstep.h
@@ -33,8 +33,6 @@ namespace Internal {
class QmakeAndroidBuildApkStepFactory : public ProjectExplorer::BuildStepFactory
{
- Q_OBJECT
-
public:
QmakeAndroidBuildApkStepFactory();
};
diff --git a/src/plugins/qmakeprojectmanager/qmakemakestep.h b/src/plugins/qmakeprojectmanager/qmakemakestep.h
index eee80f0b6e..a61806eb51 100644
--- a/src/plugins/qmakeprojectmanager/qmakemakestep.h
+++ b/src/plugins/qmakeprojectmanager/qmakemakestep.h
@@ -37,8 +37,6 @@ namespace Internal {
class QmakeMakeStepFactory : public ProjectExplorer::BuildStepFactory
{
- Q_OBJECT
-
public:
QmakeMakeStepFactory();
};
diff --git a/src/plugins/qmakeprojectmanager/qmakestep.cpp b/src/plugins/qmakeprojectmanager/qmakestep.cpp
index 9cd65d4715..f68e7296fb 100644
--- a/src/plugins/qmakeprojectmanager/qmakestep.cpp
+++ b/src/plugins/qmakeprojectmanager/qmakestep.cpp
@@ -860,7 +860,7 @@ QMakeStepFactory::QMakeStepFactory()
registerStep<QMakeStep>(QMAKE_BS_ID);
setSupportedConfiguration(Constants::QMAKE_BC_ID);
setSupportedStepList(ProjectExplorer::Constants::BUILDSTEPS_BUILD);
- setDisplayName(tr("qmake"));
+ setDisplayName(QMakeStep::tr("qmake"));
setFlags(BuildStepInfo::UniqueStep);
}
diff --git a/src/plugins/qmakeprojectmanager/qmakestep.h b/src/plugins/qmakeprojectmanager/qmakestep.h
index b4b9c42ae0..e98c20db0d 100644
--- a/src/plugins/qmakeprojectmanager/qmakestep.h
+++ b/src/plugins/qmakeprojectmanager/qmakestep.h
@@ -44,7 +44,6 @@ namespace QtSupport { class BaseQtVersion; }
namespace QmakeProjectManager {
class QmakeBuildConfiguration;
-class QmakeProject;
namespace Internal {
@@ -52,8 +51,6 @@ namespace Ui { class QMakeStep; }
class QMakeStepFactory : public ProjectExplorer::BuildStepFactory
{
- Q_OBJECT
-
public:
QMakeStepFactory();
};