From b9c10bb71502ac1a0ef9433ad1dc80c4d49962b6 Mon Sep 17 00:00:00 2001 From: hjk Date: Fri, 9 Aug 2019 10:40:40 +0200 Subject: [PATCH] QMake: Re-export the qmake buildstep id constant Will help with iOS later. Change-Id: Id4d1899e117ae5aa05ed14a42bc80f474b9c659c Reviewed-by: Christian Kandeler --- .../qmakeprojectmanager/qmakeprojectmanagerconstants.h | 1 + src/plugins/qmakeprojectmanager/qmakestep.cpp | 6 ++---- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/plugins/qmakeprojectmanager/qmakeprojectmanagerconstants.h b/src/plugins/qmakeprojectmanager/qmakeprojectmanagerconstants.h index 21d567e3c27..c3a2721ef12 100644 --- a/src/plugins/qmakeprojectmanager/qmakeprojectmanagerconstants.h +++ b/src/plugins/qmakeprojectmanager/qmakeprojectmanagerconstants.h @@ -64,6 +64,7 @@ const char QMAKEPROJECT_ID[] = "Qt4ProjectManager.Qt4Project"; const char QMAKE_BC_ID[] = "Qt4ProjectManager.Qt4BuildConfiguration"; const char MAKESTEP_BS_ID[] = "Qt4ProjectManager.MakeStep"; +const char QMAKE_BS_ID[] = "QtProjectManager.QMakeBuildStep"; // ICONS const char ICON_QTQUICK_APP[] = ":/wizards/images/qtquickapp.png"; diff --git a/src/plugins/qmakeprojectmanager/qmakestep.cpp b/src/plugins/qmakeprojectmanager/qmakestep.cpp index 29ec985e2ba..892bc897743 100644 --- a/src/plugins/qmakeprojectmanager/qmakestep.cpp +++ b/src/plugins/qmakeprojectmanager/qmakestep.cpp @@ -64,8 +64,6 @@ using namespace ProjectExplorer; using namespace Utils; namespace { -const char QMAKE_BS_ID[] = "QtProjectManager.QMakeBuildStep"; - const char QMAKE_ARGUMENTS_KEY[] = "QtProjectManager.QMakeBuildStep.QMakeArguments"; const char QMAKE_FORCED_KEY[] = "QtProjectManager.QMakeBuildStep.QMakeForced"; const char QMAKE_USE_QTQUICKCOMPILER[] = "QtProjectManager.QMakeBuildStep.UseQtQuickCompiler"; @@ -74,7 +72,7 @@ const char QMAKE_QMLDEBUGLIBAUTO_KEY[] = "QtProjectManager.QMakeBuildStep.LinkQm const char QMAKE_QMLDEBUGLIB_KEY[] = "QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibrary"; } -QMakeStep::QMakeStep(BuildStepList *bsl) : AbstractProcessStep(bsl, QMAKE_BS_ID) +QMakeStep::QMakeStep(BuildStepList *bsl) : AbstractProcessStep(bsl, Constants::QMAKE_BS_ID) { //: QMakeStep default display name setDefaultDisplayName(tr("qmake")); @@ -826,7 +824,7 @@ void QMakeStepConfigWidget::recompileMessageBoxFinished(int button) QMakeStepFactory::QMakeStepFactory() { - registerStep(QMAKE_BS_ID); + registerStep(Constants::QMAKE_BS_ID); setSupportedConfiguration(Constants::QMAKE_BC_ID); setSupportedStepList(ProjectExplorer::Constants::BUILDSTEPS_BUILD); setDisplayName(QMakeStep::tr("qmake"));