diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2013-11-15 14:36:02 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-01-15 19:28:45 +0100 |
| commit | 3fabc1ffae016dd4e02bd425a68eccf82849f796 (patch) | |
| tree | 6365b937adc7b0c2ea609ed19908a5421e2629de | |
| parent | f3d5c6986e69a9701b79058faf655804ce8414ad (diff) | |
| download | qttools-3fabc1ffae016dd4e02bd425a68eccf82849f796.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>
(cherry picked from qtcreator/e64cc71194cbe283dfe9bd2cd688f01fcdcadf34)
| -rw-r--r-- | src/linguist/shared/qmakeevaluator.cpp | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/linguist/shared/qmakeevaluator.cpp b/src/linguist/shared/qmakeevaluator.cpp index 270755315..07afedce8 100644 --- a/src/linguist/shared/qmakeevaluator.cpp +++ b/src/linguist/shared/qmakeevaluator.cpp @@ -1876,14 +1876,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; @@ -1996,13 +1994,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; } |