diff options
| author | Erik Verbruggen <erik.verbruggen@digia.com> | 2015-07-10 14:30:05 +0200 |
|---|---|---|
| committer | Erik Verbruggen <erik.verbruggen@theqtcompany.com> | 2015-07-12 13:44:44 +0000 |
| commit | 34f9b8d322f74793221029ef8a6e1053f2a0d2ae (patch) | |
| tree | 00f08151274530d6be8ca8f174f88140ade8af19 /src | |
| parent | c749f37c83cbb458e25a7d5200facf8634ac959e (diff) | |
Fix QML/JS debugging.
Converting from any ScopedObject to Object* resulted in the same
pointer value. Prevent this by not using either, but instead use the
QV4::Value directly.
Task-number: QTBUG-47061
Change-Id: I98d3889f5504dbd5962099d30d4af9d57bc518f9
Reviewed-by: Ulf Hermann <ulf.hermann@theqtcompany.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/qml/debugger/qv4debugservice.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/qml/debugger/qv4debugservice.cpp b/src/qml/debugger/qv4debugservice.cpp index 32b7b38285..cefb29e031 100644 --- a/src/qml/debugger/qv4debugservice.cpp +++ b/src/qml/debugger/qv4debugservice.cpp @@ -330,14 +330,14 @@ private: refsToInclude.append(value); } - void cacheObjectRef(QV4::Object *obj, int ref) + void cacheObjectRef(QV4::Value obj, int ref) { - objectRefs.insert(obj, ref); + objectRefs.insert(obj.val, ref); } - int cachedObjectRef(QV4::Object *obj) const + int cachedObjectRef(QV4::Value obj) const { - return objectRefs.value(obj, -1); + return objectRefs.value(obj.val, -1); } private: @@ -347,7 +347,7 @@ private: QJsonArray *destination; QSet<int> usedRefs; QHash<int, QSet<int> > refsByHandle; - QHash<QV4::Object *, int> objectRefs; + QHash<quint64, int> objectRefs; }; class QV4DebugServicePrivate : public QQmlConfigurableDebugServicePrivate |