aboutsummaryrefslogtreecommitdiffstats
path: root/tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp
diff options
context:
space:
mode:
authorSimon Hausmann <simon.hausmann@qt.io>2020-04-14 13:42:03 +0200
committerSimon Hausmann <simon.hausmann@qt.io>2020-04-14 14:51:01 +0200
commit13ede1b97224e60e6a314348e574a91f2a5b387d (patch)
tree3a033795956393cdd58ccec63cc199633f3dd107 /tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp
parent0b709f583d7ac34a7ef774a7dc36861ac9333bef (diff)
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 <fabian.kosmale@qt.io>
Diffstat (limited to 'tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp')
-rw-r--r--tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp13
1 files changed, 6 insertions, 7 deletions
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 <deque>
+
#if defined(Q_OS_MAC)
#include <unistd.h>
#endif
@@ -4888,14 +4890,11 @@ static void beginDeferredOnce(QQmlEnginePrivate *enginePriv,
enginePriv->inProgressCreations++;
- typedef QMultiHash<int, const QV4::CompiledData::Binding *> QV4PropertyBindingHash;
- auto it = std::reverse_iterator<QV4PropertyBindingHash::iterator>(range.second);
- auto last = std::reverse_iterator<QV4PropertyBindingHash::iterator>(range.first);
+ std::deque<const QV4::CompiledData::Binding *> 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;