feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QMake: Re-export the qmake buildstep id constant

Browse Source 
Will help with iOS later.

Change-Id: Id4d1899e117ae5aa05ed14a42bc80f474b9c659c
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
hjk
2019-08-09 10:40:40 +02:00
parent 2fa555bdfd
commit b9c10bb715
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/plugins/qmakeprojectmanager/qmakeprojectmanagerconstants.h
View File

@@ -64,6 +64,7 @@ const char QMAKEPROJECT_ID[] = "Qt4ProjectManager.Qt4Project";
const char QMAKE_BC_ID[] = "Qt4ProjectManager.Qt4BuildConfiguration"; const char QMAKE_BC_ID[] = "Qt4ProjectManager.Qt4BuildConfiguration";
const char MAKESTEP_BS_ID[] = "Qt4ProjectManager.MakeStep"; const char MAKESTEP_BS_ID[] = "Qt4ProjectManager.MakeStep";
const char QMAKE_BS_ID[] = "QtProjectManager.QMakeBuildStep";
// ICONS // ICONS
const char ICON_QTQUICK_APP[] = ":/wizards/images/qtquickapp.png"; const char ICON_QTQUICK_APP[] = ":/wizards/images/qtquickapp.png";

6
src/plugins/qmakeprojectmanager/qmakestep.cpp
View File

@@ -64,8 +64,6 @@ using namespace ProjectExplorer;
using namespace Utils; using namespace Utils;
namespace { namespace {
const char QMAKE_BS_ID[] = "QtProjectManager.QMakeBuildStep";
const char QMAKE_ARGUMENTS_KEY[] = "QtProjectManager.QMakeBuildStep.QMakeArguments"; const char QMAKE_ARGUMENTS_KEY[] = "QtProjectManager.QMakeBuildStep.QMakeArguments";
const char QMAKE_FORCED_KEY[] = "QtProjectManager.QMakeBuildStep.QMakeForced"; const char QMAKE_FORCED_KEY[] = "QtProjectManager.QMakeBuildStep.QMakeForced";
const char QMAKE_USE_QTQUICKCOMPILER[] = "QtProjectManager.QMakeBuildStep.UseQtQuickCompiler"; 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"; 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 //: QMakeStep default display name
setDefaultDisplayName(tr("qmake")); setDefaultDisplayName(tr("qmake"));
@@ -826,7 +824,7 @@ void QMakeStepConfigWidget::recompileMessageBoxFinished(int button)
QMakeStepFactory::QMakeStepFactory() QMakeStepFactory::QMakeStepFactory()
{ {
registerStep<QMakeStep>(QMAKE_BS_ID); registerStep<QMakeStep>(Constants::QMAKE_BS_ID);
setSupportedConfiguration(Constants::QMAKE_BC_ID); setSupportedConfiguration(Constants::QMAKE_BC_ID);
setSupportedStepList(ProjectExplorer::Constants::BUILDSTEPS_BUILD); setSupportedStepList(ProjectExplorer::Constants::BUILDSTEPS_BUILD);
setDisplayName(QMakeStep::tr("qmake")); setDisplayName(QMakeStep::tr("qmake"));