diff options
author | Kai Koehne <kai.koehne@theqtcompany.com> | 2015-04-01 11:19:32 +0200 |
---|---|---|
committer | Kai Koehne <kai.koehne@theqtcompany.com> | 2015-04-02 09:40:24 +0000 |
commit | 46fc33d9147c843d122d8384ab9c1465ef716ee1 (patch) | |
tree | f38df0070a41eb5d3a670dd3730ff332cdb263cc /src/plugins/debugger/qml/qmlv8debuggerclient.cpp | |
parent | 87e01423c90e6ada4b0388f7a7ee3ba83567fd2f (diff) | |
download | qt-creator-46fc33d9147c843d122d8384ab9c1465ef716ee1.tar.gz |
Don't mix iterator and const_iterator
This avoids unnecessary detaches of the Qt container data.
The mismatches where detected by defining QT_STRICT_ITERATORS;
however, this define violates the ODR (causing linker errors),
and therefore is not added permanently.
Change-Id: Idd336a9c8b394214a820437ef1b92d2101f6101c
GPush-Base: 62b0848b9cf357bcded4184c71d490bae56c773b
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
Diffstat (limited to 'src/plugins/debugger/qml/qmlv8debuggerclient.cpp')
-rw-r--r-- | src/plugins/debugger/qml/qmlv8debuggerclient.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/debugger/qml/qmlv8debuggerclient.cpp b/src/plugins/debugger/qml/qmlv8debuggerclient.cpp index 65b02fbfe4..811f00bc46 100644 --- a/src/plugins/debugger/qml/qmlv8debuggerclient.cpp +++ b/src/plugins/debugger/qml/qmlv8debuggerclient.cpp @@ -1510,8 +1510,8 @@ void QmlV8DebuggerClient::setCurrentFrameDetails(const QVariant &bodyVal, const d->engine->gotoLocation(stackHandler->currentFrame()); // Expand watch data that were previously expanded - QHash<quint64, QByteArray>::const_iterator itEnd = handlesToLookup.end(); - for (QHash<quint64, QByteArray>::const_iterator it = handlesToLookup.begin(); it != itEnd; ++it) + QHash<quint64, QByteArray>::const_iterator itEnd = handlesToLookup.constEnd(); + for (QHash<quint64, QByteArray>::const_iterator it = handlesToLookup.constBegin(); it != itEnd; ++it) expandObject(it.value(), it.key()); emit stackFrameCompleted(); } |