diff options
author | Christian Kandeler <christian.kandeler@digia.com> | 2014-06-24 11:19:08 +0200 |
---|---|---|
committer | Christian Kandeler <christian.kandeler@digia.com> | 2014-07-02 11:18:42 +0200 |
commit | 1cf03765801e3f391323bba3e040a8786017354a (patch) | |
tree | 54b2d21267d0de1e800c087e4f8e33176f86c59c /src/lib/corelib/language/evaluator.cpp | |
parent | e655304fed77ad45cb083a4f62ba308d734025a3 (diff) |
Correctly handle overriding of file tags via an empty list.
Task-number: QBS-633
Change-Id: I4bf750ff94d6fae38fb3fdb49de265caddcd789e
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Diffstat (limited to 'src/lib/corelib/language/evaluator.cpp')
-rw-r--r-- | src/lib/corelib/language/evaluator.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/corelib/language/evaluator.cpp b/src/lib/corelib/language/evaluator.cpp index 46f0476e6..692c1254e 100644 --- a/src/lib/corelib/language/evaluator.cpp +++ b/src/lib/corelib/language/evaluator.cpp @@ -100,9 +100,9 @@ bool Evaluator::boolValue(const Item *item, const QString &name, bool defaultVal return v.toBool(); } -FileTags Evaluator::fileTagsValue(const Item *item, const QString &name) +FileTags Evaluator::fileTagsValue(const Item *item, const QString &name, bool *propertySet) { - return FileTags::fromStringList(stringListValue(item, name)); + return FileTags::fromStringList(stringListValue(item, name, propertySet)); } QString Evaluator::stringValue(const Item *item, const QString &name, |