From ecfb6eaf5a9751b6f56c531cea117493f61fac47 Mon Sep 17 00:00:00 2001
From: dt <qtc-committer@nokia.com>
Date: Tue, 21 Jul 2009 15:01:16 +0200
Subject: [PATCH] Remove the qmakeStep() function from qt4Project
---
src/plugins/qt4projectmanager/qt4project.cpp | 10 ----------
src/plugins/qt4projectmanager/qt4project.h | 1 -
src/plugins/qt4projectmanager/qt4projectmanager.cpp | 11 ++++++++---
3 files changed, 8 insertions(+), 14 deletions(-)
diff --git a/src/plugins/qt4projectmanager/qt4project.cpp b/src/plugins/qt4projectmanager/qt4project.cpp
index adbe99c9053..46be0332153 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 073728a4923..6ed7a64b7d9 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 cb920a17b2a..bb47b9315ba 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)
--
GitLab