diff options
author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-07-03 10:43:39 +0200 |
---|---|---|
committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-07-09 21:12:51 +0200 |
commit | bc4c4996843947ba62161f118d2dbc29db383796 (patch) | |
tree | ccb8ae1ab2a8a907060c77f46671d98e275d4b6f /src/shared/proparser/qmakeevaluator.cpp | |
parent | db6f01ba4abef8651b840cefd53b2cd1601f9626 (diff) | |
download | qt-creator-bc4c4996843947ba62161f118d2dbc29db383796.tar.gz |
eliminate EvalIntoMode
it's a relic from times of entanglement with ProFileEvaluator.
Change-Id: I903c1a8a21fcb4a0c9029d0245fba56043e62718
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Diffstat (limited to 'src/shared/proparser/qmakeevaluator.cpp')
-rw-r--r-- | src/shared/proparser/qmakeevaluator.cpp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/shared/proparser/qmakeevaluator.cpp b/src/shared/proparser/qmakeevaluator.cpp index 4b9c77d2a8..64a5262996 100644 --- a/src/shared/proparser/qmakeevaluator.cpp +++ b/src/shared/proparser/qmakeevaluator.cpp @@ -1831,14 +1831,12 @@ bool QMakeEvaluator::evaluateFeatureFile(const QString &fileName) return ok; } -bool QMakeEvaluator::evaluateFileInto( - const QString &fileName, QMakeHandler::EvalFileType type, - ProValueMap *values, EvalIntoMode mode) +bool QMakeEvaluator::evaluateFileInto(const QString &fileName, QMakeHandler::EvalFileType type, + ProValueMap *values, LoadFlags flags) { QMakeEvaluator visitor(m_option, m_parser, m_handler); visitor.m_outputDir = m_outputDir; - if (!visitor.evaluateFile(fileName, type, - (mode == EvalWithSetup) ? LoadAll : LoadProOnly)) + if (!visitor.evaluateFile(fileName, type, flags)) return false; *values = visitor.m_valuemapStack.top(); return true; |