diff options
| author | Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org> | 2019-11-04 03:00:55 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2019-11-04 13:55:43 +0100 |
| commit | c34155c55259edfaba104d66095a2670f9d936e7 (patch) | |
| tree | 45eab905d8b55150b153082976068e9b4d0789f2 /src/xmlpatterns/expr/qexpression.cpp | |
| parent | 63b58773d56ecfddfe6d25cb13c06f3dff9737e9 (diff) | |
Update dependencies on 'dev' in qt/qtxmlpatterns
Also applied build fixes to build with QList == QVector.
This means replacing forward-declarations and removing conversion code
between list and vector.
Change-Id: I6eac649f8376eafca8f96c3fa603d27ad5ad7b38
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src/xmlpatterns/expr/qexpression.cpp')
| -rw-r--r-- | src/xmlpatterns/expr/qexpression.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/xmlpatterns/expr/qexpression.cpp b/src/xmlpatterns/expr/qexpression.cpp index 3db1e4f6..c7ecaea2 100644 --- a/src/xmlpatterns/expr/qexpression.cpp +++ b/src/xmlpatterns/expr/qexpression.cpp @@ -86,9 +86,9 @@ void Expression::typeCheckOperands(const StaticContext::Ptr &context) /* If we create a focus, we handle the last one specially, so avoid it in the loop. */ const bool createsFocus = has(CreatesFocusForLast); - const SequenceType::List::const_iterator typeEnd(createsFocus ? --opTypes.constEnd() + const SequenceType::List::const_iterator typeEnd(createsFocus ? (opTypes.constEnd() - 1) : opTypes.constEnd()); - const Expression::List::const_iterator end(createsFocus ? --ops.constEnd() + const Expression::List::const_iterator end(createsFocus ? (ops.constEnd() - 1) : ops.constEnd()); SequenceType::List::const_iterator reqType(opTypes.constBegin()); |