diff options
author | hjk <hjk@qt.io> | 2019-07-24 13:43:54 +0200 |
---|---|---|
committer | hjk <hjk@qt.io> | 2019-07-29 08:54:18 +0000 |
commit | e3b1106afae5de6cd54ce627a0b11be041624591 (patch) | |
tree | accfac6791013e79476650b6dd840d5cf243e12b /src/plugins/debugger/qml/qmlengine.cpp | |
parent | 02e224fcfa7135f1e32adb02a14426ea153ae618 (diff) |
Compile fix with recent Qt dev
The reasoning in 1b4766e26c6b did not take into account that the scope
of QT_NO_JAVA_STYLE_ITERATORS may change over time, as done with
f70905448f6 in Qt base.
Change-Id: Ib1966ff26c4d36d5f62e149d6b45baa4aecf825d
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Diffstat (limited to 'src/plugins/debugger/qml/qmlengine.cpp')
-rw-r--r-- | src/plugins/debugger/qml/qmlengine.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/plugins/debugger/qml/qmlengine.cpp b/src/plugins/debugger/qml/qmlengine.cpp index 6b3dd37193..3b8ed0a9c5 100644 --- a/src/plugins/debugger/qml/qmlengine.cpp +++ b/src/plugins/debugger/qml/qmlengine.cpp @@ -886,12 +886,10 @@ static ConsoleItem *constructLogItemTree(const QVariant &result, else text = key + " : Object"; - QMap<QString, QVariant> resultMap = result.toMap(); + const QMap<QString, QVariant> resultMap = result.toMap(); QVarLengthArray<ConsoleItem *> children(resultMap.size()); - QMapIterator<QString, QVariant> i(result.toMap()); auto it = children.begin(); - while (i.hasNext()) { - i.next(); + for (auto i = resultMap.cbegin(), end = resultMap.cend(); i != end; ++i) { *(it++) = constructLogItemTree(i.value(), i.key()); } |