diff --git a/src/plugins/qt4projectmanager/qt4project.cpp b/src/plugins/qt4projectmanager/qt4project.cpp index adbe99c90536e6728c739ec4531be0d3d05a96f1..46be033215315410dc9c1d435b5a9e74abd85e71 100644 --- a/src/plugins/qt4projectmanager/qt4project.cpp +++ b/src/plugins/qt4projectmanager/qt4project.cpp @@ -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; diff --git a/src/plugins/qt4projectmanager/qt4project.h b/src/plugins/qt4projectmanager/qt4project.h index 073728a49231d9ba376b4d4a02cb63f75d6e01fb..6ed7a64b7d9c424a6746f265ba4c22cfad5f0f75 100644 --- a/src/plugins/qt4projectmanager/qt4project.h +++ b/src/plugins/qt4projectmanager/qt4project.h @@ -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); diff --git a/src/plugins/qt4projectmanager/qt4projectmanager.cpp b/src/plugins/qt4projectmanager/qt4projectmanager.cpp index cb920a17b2a66389be97ff70dc396d7ca5c67ee1..bb47b9315ba2f525e62e589c548dfd37a6f3cbfa 100644 --- a/src/plugins/qt4projectmanager/qt4projectmanager.cpp +++ b/src/plugins/qt4projectmanager/qt4projectmanager.cpp @@ -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)