From 8bb90d47bdc8e8d21371a57a33107ebe11dea128 Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Date: Mon, 15 Feb 2010 17:12:32 +0100
Subject: [PATCH] fix include() parseInto implementation
the "namespace" created by the prefix is supposed to be cleared before
new values are added.
---
src/shared/proparser/profileevaluator.cpp | 16 +++++++++++++---
1 file changed, 13 insertions(+), 3 deletions(-)
diff --git a/src/shared/proparser/profileevaluator.cpp b/src/shared/proparser/profileevaluator.cpp
index a7646be104b..4e7fed550a5 100644
--- a/src/shared/proparser/profileevaluator.cpp
+++ b/src/shared/proparser/profileevaluator.cpp
@@ -2749,12 +2749,22 @@ ProItem::ProItemReturn ProFileEvaluator::Private::evaluateConditionalFunction(
m_sts = sts;
} else {
QHash<QString, QStringList> symbols;
- if ((ok = evaluateFileInto(fn, &symbols, 0)))
+ if ((ok = evaluateFileInto(fn, &symbols, 0))) {
+ QHash<QString, QStringList> newMap;
+ for (QHash<QString, QStringList>::ConstIterator
+ it = m_valuemapStack.top().constBegin(),
+ end = m_valuemapStack.top().constEnd();
+ it != end; ++it)
+ if (!(it.key().startsWith(parseInto) &&
+ (it.key().length() == parseInto.length()
+ || it.key().at(parseInto.length()) == QLatin1Char('.'))))
+ newMap[it.key()] = it.value();
for (QHash<QString, QStringList>::ConstIterator it = symbols.constBegin();
it != symbols.constEnd(); ++it)
if (!it.key().startsWith(QLatin1Char('.')))
- m_valuemapStack.top().insert(parseInto + QLatin1Char('.') + it.key(),
- it.value());
+ newMap.insert(parseInto + QLatin1Char('.') + it.key(), it.value());
+ m_valuemapStack.top() = newMap;
+ }
}
return returnBool(ok);
}
--
GitLab