diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2016-06-29 15:40:17 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2016-07-13 14:26:42 +0000 |
| commit | b27d4835c2ae0d8767ca914acb72a4bdcea6fc85 (patch) | |
| tree | f46e004105b7afd42bd35c3ab4f8e11bbfed0889 /qmake/project.h | |
| parent | 07d3cbbe8450f870446f4bd2af2ec47baff23dc3 (diff) | |
fix error() not propagating through if()
if() would simply "downgrade" a fatal error to a false condition, which
is certainly not expected.
Change-Id: Ie9c54f2bddf588856498bf795007b341b7c9363a
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'qmake/project.h')
| -rw-r--r-- | qmake/project.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/qmake/project.h b/qmake/project.h index 7cd49a457c..2c4883e578 100644 --- a/qmake/project.h +++ b/qmake/project.h @@ -60,7 +60,7 @@ public: ProString expand(const QString &v, const QString &file, int line); QStringList expand(const ProKey &func, const QList<ProStringList> &args); bool test(const QString &v, const QString &file, int line) - { m_current.clear(); return evaluateConditional(v, file, line); } + { m_current.clear(); return evaluateConditional(v, file, line) == ReturnTrue; } bool test(const ProKey &func, const QList<ProStringList> &args); bool isSet(const ProKey &v) const { return m_valuemapStack.first().contains(v); } |