Commit ecfb6eaf authored by dt's avatar dt
Browse files

Remove the qmakeStep() function from qt4Project

parent 406d853e
......@@ -1044,16 +1044,6 @@ void Qt4Project::proFileUpdated(Qt4ProjectManager::Internal::Qt4ProFileNode *nod
}
}
QMakeStep *Qt4Project::qmakeStep() const
{
QMakeStep *qs = 0;
foreach(BuildStep *bs, buildSteps())
if ( (qs = qobject_cast<QMakeStep *>(bs)) != 0)
return qs;
return 0;
}
MakeStep *Qt4Project::makeStep() const
{
MakeStep *qs = 0;
......
......@@ -179,7 +179,6 @@ public:
// That is generally the stuff that is asked should normally be transfered to
// Qt4Project *
// So that we can later enable people to build qt4projects the way they would like
QMakeStep *qmakeStep() const;
MakeStep *makeStep() const;
void notifyChanged(const QString &name);
......
......@@ -256,11 +256,16 @@ void Qt4Manager::runQMakeContextMenu()
void Qt4Manager::runQMake(ProjectExplorer::Project *p)
{
QMakeStep *qmakeStep = qobject_cast<Qt4Project *>(p)->qmakeStep();
QMakeStep *qs = 0;
foreach(BuildStep *bs, p->buildSteps())
if ( (qs = qobject_cast<QMakeStep *>(bs)) != 0)
break;
if (!qs)
return;
//found qmakeStep, now use it
qmakeStep->setForced(true);
qs->setForced(true);
const QString &config = p->activeBuildConfiguration();
m_projectExplorer->buildManager()->appendStep(qmakeStep, config);
m_projectExplorer->buildManager()->appendStep(qs, config);
}
QString Qt4Manager::fileTypeId(ProjectExplorer::FileType type)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment