From 192759cb9a836f16ef20ac7220fc0aa9c54cd176 Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Date: Fri, 18 Jun 2010 20:21:05 +0200
Subject: [PATCH] use a ProFileParser+ProFileEvaluator instead of a
ProFileReader
the latter does too much
---
src/plugins/qt4projectmanager/qtversionmanager.cpp | 14 ++++++++++----
1 file changed, 10 insertions(+), 4 deletions(-)
diff --git a/src/plugins/qt4projectmanager/qtversionmanager.cpp b/src/plugins/qt4projectmanager/qtversionmanager.cpp
index 2dab6cb9453..2f89bdbd71f 100644
--- a/src/plugins/qt4projectmanager/qtversionmanager.cpp
+++ b/src/plugins/qt4projectmanager/qtversionmanager.cpp
@@ -1329,11 +1329,17 @@ void QtVersion::updateToolChainAndMkspec() const
ProFileOption option;
option.properties = versionInfo();
+ ProMessageHandler msgHandler(true);
ProFileCacheManager::instance()->incRefCount();
- ProFileReader *reader = new ProFileReader(&option);
- reader->setCumulative(false);
- reader->setParsePreAndPostFiles(false);
- reader->readProFile(m_mkspecFullPath + "/qmake.conf");
+ ProFileParser parser(ProFileCacheManager::instance()->cache(), &msgHandler);
+ ProFileEvaluator *reader = new ProFileEvaluator(&option, &parser, &msgHandler);
+ if (ProFile *pro = parser.parsedProFile(m_mkspecFullPath + "/qmake.conf")) {
+ reader->setCumulative(false);
+ reader->setParsePreAndPostFiles(false);
+ reader->accept(pro);
+ pro->deref();
+ }
+
QString qmakeCXX = reader->values("QMAKE_CXX").join(" ");
QString makefileGenerator = reader->value("MAKEFILE_GENERATOR");
QString ce_sdk = reader->values("CE_SDK").join(QLatin1String(" "));
--
GitLab