From 82e10eae3b5e2f10e60c9db724a54622917f5c60 Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Date: Fri, 18 Jun 2010 21:15:14 +0200
Subject: [PATCH] use once parsed pro file for both exact and cumulative
evaluation
---
src/plugins/qt4projectmanager/qt4nodes.cpp | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/src/plugins/qt4projectmanager/qt4nodes.cpp b/src/plugins/qt4projectmanager/qt4nodes.cpp
index 3a934f6007e..882fe1d6def 100644
--- a/src/plugins/qt4projectmanager/qt4nodes.cpp
+++ b/src/plugins/qt4projectmanager/qt4nodes.cpp
@@ -1024,10 +1024,15 @@ void Qt4ProFileNode::setupReader()
bool Qt4ProFileNode::evaluate()
{
bool parserError = false;
- if (!m_readerExact->readProFile(m_projectFilePath))
- parserError = true;
- if (!m_readerCumulative->readProFile(m_projectFilePath))
+ if (ProFile *pro = m_readerExact->parsedProFile(m_projectFilePath)) {
+ if (!m_readerExact->accept(pro))
+ parserError = true;
+ if (!m_readerCumulative->accept(pro))
+ parserError = true;
+ pro->deref();
+ } else {
parserError = true;
+ }
return parserError;
}
--
GitLab