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

Use make step base for qmake projects

Browse Source 
There are two differences that get introduced by this change:
- The configuration widget checks that there is a build configuration,
  but not if this build configuration is a QmakeBuildConfiguration. This
  should not matter, since Qmake is still the only supported project
  type for the qmake specific make step
- It removes the automaticallyAddedArguments(). As far as I can see this
  never had any effect anyhow, though. They were never actually added to
  the arguments.

Change-Id: I73be227a32117e462def38bdd040dbd7cbcc113f
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
This commit is contained in:
Eike Ziller
2018-05-14 16:39:19 +02:00
parent 96959e93d8
commit 2e8d1d00ae
9 changed files with 33 additions and 362 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugins/qmakeprojectmanager/qmakebuildconfiguration.cpp
View File

@@ -127,10 +127,10 @@ void QmakeBuildConfiguration::initialize(const BuildInfo *info)
BuildStepList *buildSteps = stepList(ProjectExplorer::Constants::BUILDSTEPS_BUILD);
auto qmakeStep = new QMakeStep(buildSteps);
buildSteps->appendStep(qmakeStep);
buildSteps->appendStep(new MakeStep(buildSteps));
buildSteps->appendStep(new QmakeMakeStep(buildSteps));
BuildStepList *cleanSteps = stepList(ProjectExplorer::Constants::BUILDSTEPS_CLEAN);
cleanSteps->appendStep(new MakeStep(cleanSteps));
cleanSteps->appendStep(new QmakeMakeStep(cleanSteps));
const QmakeBuildInfo *qmakeInfo = static_cast<const QmakeBuildInfo *>(info);
BaseQtVersion *version = QtKitInformation::qtVersion(target()->kit());
@@ -315,13 +315,13 @@ QMakeStep *QmakeBuildConfiguration::qmakeStep() const
return 0;
}
MakeStep *QmakeBuildConfiguration::makeStep() const
QmakeMakeStep *QmakeBuildConfiguration::makeStep() const
{
MakeStep *ms = 0;
QmakeMakeStep *ms = 0;
BuildStepList *bsl = stepList(Core::Id(ProjectExplorer::Constants::BUILDSTEPS_BUILD));
Q_ASSERT(bsl);
for (int i = 0; i < bsl->count(); ++i)
if ((ms = qobject_cast<MakeStep *>(bsl->at(i))) != 0)
if ((ms = qobject_cast<QmakeMakeStep *>(bsl->at(i))) != 0)
return ms;
return 0;
}