1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

give location information for QMAKE_SUBSTITUTES conditionals

Browse Source 
Change-Id: I9b6bee252d4ed4bf263394ace29a4fb3b324a8cd
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
This commit is contained in:
Oswald Buddenhagen 2012-08-28 20:53:25 +02:00 committed by Qt by Nokia
parent 0f53c2c4e8
commit 3322759b49
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
qmake/generators/makefile.cpp
View File

@ -538,7 +538,7 @@ MakefileGenerator::init()
if (line.startsWith("!!IF ")) { if (line.startsWith("!!IF ")) {
if (state.isEmpty() || state.top() == IN_CONDITION) { if (state.isEmpty() || state.top() == IN_CONDITION) {
QString test = line.mid(5, line.length()-(5+1)); QString test = line.mid(5, line.length()-(5+1));
if (project->test(test)) if (project->test(test, inn, count))
state.push(IN_CONDITION); state.push(IN_CONDITION);
else else
state.push(PENDING_CONDITION); state.push(PENDING_CONDITION);
@ -551,7 +551,7 @@ MakefileGenerator::init()
in.fileName().toLatin1().constData(), count); in.fileName().toLatin1().constData(), count);
} else if (state.top() == PENDING_CONDITION) { } else if (state.top() == PENDING_CONDITION) {
QString test = line.mid(7, line.length()-(7+1)); QString test = line.mid(7, line.length()-(7+1));
if (project->test(test)) { if (project->test(test, inn, count)) {
state.pop(); state.pop();
state.push(IN_CONDITION); state.push(IN_CONDITION);
} }

4
qmake/project.h
View File

@ -64,8 +64,8 @@ public:
ProString expand(const QString &v, const QString &file, int line); ProString expand(const QString &v, const QString &file, int line);
QStringList expand(const ProKey &func, const QList<ProStringList> &args); QStringList expand(const ProKey &func, const QList<ProStringList> &args);
bool test(const QString &v) bool test(const QString &v, const QString &file, int line)
{ m_current.clear(); return evaluateConditional(v, QStringLiteral("(generator)")); } { m_current.clear(); return evaluateConditional(v, file, line); }
bool test(const ProKey &func, const QList<ProStringList> &args); bool test(const ProKey &func, const QList<ProStringList> &args);
bool isSet(const ProKey &v) const { return m_valuemapStack.first().contains(v); } bool isSet(const ProKey &v) const { return m_valuemapStack.first().contains(v); }