From f020edc28769f2d3c36502db7fd58e1798f22cc9 Mon Sep 17 00:00:00 2001 From: hjk Date: Wed, 12 Aug 2015 14:01:17 +0200 Subject: [PATCH] Debugger: Fix QJsonDumper with LLDB Change-Id: Ied299468a3f125540894278841114591cfecb02b Reviewed-by: Christian Stenger --- share/qtcreator/debugger/qttypes.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/share/qtcreator/debugger/qttypes.py b/share/qtcreator/debugger/qttypes.py index 7ab1d403be4..41f515e542f 100644 --- a/share/qtcreator/debugger/qttypes.py +++ b/share/qtcreator/debugger/qttypes.py @@ -2609,11 +2609,11 @@ def qdumpHelper__QJsonArray(d, data, array): array is passed as integer pointer to the QJsonPrivate::Base object. """ - if d.isNull(data): - n = 0 - else: + if data: # The 'length' part of the _dummy member: n = qdumpHelper_qle_cutBits(d.extractUInt(array + 4), 1, 31) + else: + n = 0 d.putItemCount(n) d.putNumChild(1) @@ -2634,11 +2634,11 @@ def qdumpHelper__QJsonObject(d, data, obj): obj is passed as integer pointer to the QJsonPrivate::Base object. """ - if d.isNull(data): - n = 0 - else: + if data: # The 'length' part of the _dummy member: n = qdumpHelper_qle_cutBits(d.extractUInt(obj + 4), 1, 31) + else: + n = 0 d.putItemCount(n) d.putNumChild(1)