feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

move LoadFlags to QMakeEvaluator

Browse Source 
Change-Id: I931bce3aaf1ccaaacf586ca54b93659485b79372
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
This commit is contained in:
Oswald Buddenhagen
2012-06-11 20:56:24 +02:00
parent b4f38671a2
commit 251ed0e878
10 changed files with 35 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/shared/proparser/qmakebuiltins.cpp
View File

@@ -30,12 +30,11 @@
**
**************************************************************************/
#include "profileevaluator.h"
#include "qmakeevaluator.h"
#include "qmakeevaluator_p.h"
#include "qmakeglobals.h"
#include "qmakeparser.h"
#include "qmakeevaluator.h"
#include "qmakeevaluator_p.h"
#include "ioutils.h"
#include <QByteArray>
@@ -992,8 +991,7 @@ QMakeEvaluator::VisitReturn QMakeEvaluator::evaluateConditionalFunction(
fn.detach();
bool ok;
if (parseInto.isEmpty()) {
ok = evaluateFile(fn, QMakeEvaluatorHandler::EvalIncludeFile,
ProFileEvaluator::LoadProOnly);
ok = evaluateFile(fn, QMakeEvaluatorHandler::EvalIncludeFile, LoadProOnly);
} else {
QHash<ProString, ProStringList> symbols;
if ((ok = evaluateFileInto(fn, QMakeEvaluatorHandler::EvalAuxFile,