From 377e6ff5dd346b9c82849b357a366edb4b3fe983 Mon Sep 17 00:00:00 2001
From: dt <qtc-committer@nokia.com>
Date: Tue, 8 Dec 2009 13:09:16 +0100
Subject: [PATCH] Make runQMake simpler
---
src/plugins/qt4projectmanager/qt4projectmanager.cpp | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/src/plugins/qt4projectmanager/qt4projectmanager.cpp b/src/plugins/qt4projectmanager/qt4projectmanager.cpp
index 0d7885638f1..24c52a7faea 100644
--- a/src/plugins/qt4projectmanager/qt4projectmanager.cpp
+++ b/src/plugins/qt4projectmanager/qt4projectmanager.cpp
@@ -35,6 +35,7 @@
#include "qt4project.h"
#include "profilereader.h"
#include "qmakestep.h"
+#include "qt4buildconfiguration.h"
#include <coreplugin/icore.h>
#include <coreplugin/basefilewizard.h>
@@ -247,12 +248,10 @@ void Qt4Manager::runQMakeContextMenu()
void Qt4Manager::runQMake(ProjectExplorer::Project *p)
{
- QTC_ASSERT(p, return);
- ProjectExplorer::BuildConfiguration *bc = p->activeBuildConfiguration();
- QMakeStep *qs = 0;
- foreach(BuildStep *bs, bc->buildSteps())
- if ((qs = qobject_cast<QMakeStep *>(bs)) != 0)
- break;
+ Qt4Project *qt4pro = qobject_cast<Qt4Project *>(p);
+ QTC_ASSERT(qt4pro, return);
+ Qt4BuildConfiguration *bc = qt4pro->activeQt4BuildConfiguration();
+ QMakeStep *qs = bc->qmakeStep();
if (!qs)
return;
--
GitLab