summaryrefslogtreecommitdiff
path: root/src/shared
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@digia.com>2013-11-15 14:36:02 +0100
committerOswald Buddenhagen <oswald.buddenhagen@digia.com>2013-11-15 19:23:45 +0100
commite64cc71194cbe283dfe9bd2cd688f01fcdcadf34 (patch)
tree6141f1a6c45837a5464f14e2bda0c0837281282f /src/shared
parentf30f44062b3a482d5cf766019f42b55d38025786 (diff)
downloadqt-creator-e64cc71194cbe283dfe9bd2cd688f01fcdcadf34.tar.gz
set QMAKE_INTERNAL_INCLUDED_FILES even without PROEVALUATOR_FULL
some qt prfs use this variable, so better set it it to avoid some noise. Change-Id: I606c88dd7664b1cd8b490d60badd5c6bf80fd1c9 Reviewed-by: Daniel Teske <daniel.teske@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Diffstat (limited to 'src/shared')
-rw-r--r--src/shared/proparser/qmakeevaluator.cpp4
1 files changed, 0 insertions, 4 deletions
diff --git a/src/shared/proparser/qmakeevaluator.cpp b/src/shared/proparser/qmakeevaluator.cpp
index 76da8cabaa..a5def320af 100644
--- a/src/shared/proparser/qmakeevaluator.cpp
+++ b/src/shared/proparser/qmakeevaluator.cpp
@@ -1864,14 +1864,12 @@ QMakeEvaluator::VisitReturn QMakeEvaluator::evaluateFile(
VisitReturn ok = visitProFile(pro, type, flags);
m_current = m_locationStack.pop();
pro->deref();
-#ifdef PROEVALUATOR_FULL
if (ok == ReturnTrue && !(flags & LoadHidden)) {
ProStringList &iif = m_valuemapStack.first()[ProKey("QMAKE_INTERNAL_INCLUDED_FILES")];
ProString ifn(fileName);
if (!iif.contains(ifn))
iif << ifn;
}
-#endif
return ok;
} else {
return ReturnFalse;
@@ -1984,13 +1982,11 @@ QMakeEvaluator::VisitReturn QMakeEvaluator::evaluateFileInto(
if (ret != ReturnTrue)
return ret;
*values = visitor.m_valuemapStack.top();
-#ifdef PROEVALUATOR_FULL
ProKey qiif("QMAKE_INTERNAL_INCLUDED_FILES");
ProStringList &iif = m_valuemapStack.first()[qiif];
foreach (const ProString &ifn, values->value(qiif))
if (!iif.contains(ifn))
iif << ifn;
-#endif
return ReturnTrue;
}