diff options
author | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2016-05-13 15:32:50 +0200 |
---|---|---|
committer | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2016-05-24 12:38:59 +0000 |
commit | ad17a35853fe21a93fc34f7b2d9262c5ac992b29 (patch) | |
tree | 668279d86081849c0cfd01933ebf687694d93f46 /qmake/project.h | |
parent | 11d957d04381c7162dd5621c61f9963580ec7041 (diff) |
make QMakeParser take a QStringRef as input
the only place where this actually saves a deep copy is the evaluation
of if(), but as a side effect the parser is now able to deal with not
null-terminated strings, which is kinda nice as well.
Change-Id: Ib6d08617aa79d2f9eaecd4906d4d548f34bf377d
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
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 9f3b9a56bc..4986c7c82d 100644 --- a/qmake/project.h +++ b/qmake/project.h @@ -55,7 +55,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(QStringRef(&v), file, line); } bool test(const ProKey &func, const QList<ProStringList> &args); bool isSet(const ProKey &v) const { return m_valuemapStack.first().contains(v); } |