From 13ede1b97224e60e6a314348e574a91f2a5b387d Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Tue, 14 Apr 2020 13:42:03 +0200 Subject: Fix build with latest QHash from qtbase std: :reverse_iterator is not supported anymore on QHash's iterators. Change-Id: I755ef69e1c2cc9427a77c49ae2ff85055345ff12 Reviewed-by: Fabian Kosmale --- tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp') diff --git a/tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp b/tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp index 8bee4ef260..4ea8de5a40 100644 --- a/tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp +++ b/tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp @@ -54,6 +54,8 @@ #include "../../shared/util.h" +#include + #if defined(Q_OS_MAC) #include #endif @@ -4888,14 +4890,11 @@ static void beginDeferredOnce(QQmlEnginePrivate *enginePriv, enginePriv->inProgressCreations++; - typedef QMultiHash QV4PropertyBindingHash; - auto it = std::reverse_iterator(range.second); - auto last = std::reverse_iterator(range.first); + std::deque reversedBindings; + std::copy(range.first, range.second, std::front_inserter(reversedBindings)); state->creator->beginPopulateDeferred(deferData->context); - while (it != last) { - state->creator->populateDeferredBinding(property, deferData->deferredIdx, *it); - ++it; - } + for (const QV4::CompiledData::Binding *binding: reversedBindings) + state->creator->populateDeferredBinding(property, deferData->deferredIdx, binding); state->creator->finalizePopulateDeferred(); state->errors << state->creator->errors; -- cgit v1.2.3