From dc09a3f40bbe671805de61949c09bb0e60880281 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Tue, 8 Feb 2011 21:18:03 +0100 Subject: [PATCH] use exact evaluator also for TARGET.CAPABILITY special-casing it makes no sense, as all other values from the project would be mismatched and thus worthless for code validation anyway. --- src/plugins/qt4projectmanager/qt4nodes.cpp | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/plugins/qt4projectmanager/qt4nodes.cpp b/src/plugins/qt4projectmanager/qt4nodes.cpp index 279bdbf2f69..0524e7da675 100644 --- a/src/plugins/qt4projectmanager/qt4nodes.cpp +++ b/src/plugins/qt4projectmanager/qt4nodes.cpp @@ -1743,10 +1743,7 @@ void Qt4ProFileNode::applyEvaluate(bool parseResult, bool async) newVarValues[QmlImportPathVar] = m_readerExact->absolutePathValues( QLatin1String("QML_IMPORT_PATH"), m_projectDir); newVarValues[Makefile] = m_readerExact->values("MAKEFILE"); - - // We use the cumulative parse so that we get the capabilities for symbian even if - // a different target is selected and the capabilities are set in a symbian scope - newVarValues[SymbianCapabilities] = m_readerCumulative->values("TARGET.CAPABILITY"); + newVarValues[SymbianCapabilities] = m_readerExact->values("TARGET.CAPABILITY"); if (m_varValues != newVarValues) { Qt4VariablesHash oldValues = m_varValues;