summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorhjk <hjk@theqtcompany.com>2015-08-12 14:01:17 +0200
committerhjk <hjk@theqtcompany.com>2015-08-12 13:55:01 +0000
commitf020edc28769f2d3c36502db7fd58e1798f22cc9 (patch)
tree59e394232cd56b8bad236f7d5c160c139fe950fb
parent786aa4a441c8aa08ab519823a3abcc640b502845 (diff)
downloadqt-creator-f020edc28769f2d3c36502db7fd58e1798f22cc9.tar.gz
Debugger: Fix QJsonDumper with LLDB
Change-Id: Ied299468a3f125540894278841114591cfecb02b Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
-rw-r--r--share/qtcreator/debugger/qttypes.py12
1 files changed, 6 insertions, 6 deletions
diff --git a/share/qtcreator/debugger/qttypes.py b/share/qtcreator/debugger/qttypes.py
index 7ab1d403be..41f515e542 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)