summaryrefslogtreecommitdiffstats
path: root/qmake/project.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'qmake/project.cpp')
-rw-r--r--qmake/project.cpp19
1 files changed, 9 insertions, 10 deletions
diff --git a/qmake/project.cpp b/qmake/project.cpp
index 45773db784..41bdab728c 100644
--- a/qmake/project.cpp
+++ b/qmake/project.cpp
@@ -124,17 +124,16 @@ QStringList QMakeProject::expand(const ProKey &func, const QList<ProStringList>
ProString QMakeProject::expand(const QString &expr, const QString &where, int line)
{
ProString ret;
- if (ProFile *pro = m_parser->parsedProBlock(expr, where, line, QMakeParser::ValueGrammar)) {
- if (pro->isOk()) {
- m_current.pro = pro;
- m_current.line = 0;
- const ushort *tokPtr = pro->tokPtr();
- ProStringList result = expandVariableReferences(tokPtr, 1, true);
- if (!result.isEmpty())
- ret = result.at(0);
- }
- pro->deref();
+ ProFile *pro = m_parser->parsedProBlock(expr, where, line, QMakeParser::ValueGrammar);
+ if (pro->isOk()) {
+ m_current.pro = pro;
+ m_current.line = 0;
+ const ushort *tokPtr = pro->tokPtr();
+ ProStringList result = expandVariableReferences(tokPtr, 1, true);
+ if (!result.isEmpty())
+ ret = result.at(0);
}
+ pro->deref();
return ret;
}