From dd2a880b8cc181aee525b27141dc08ec42c245a7 Mon Sep 17 00:00:00 2001 From: hjk Date: Tue, 24 Nov 2020 08:06:47 +0100 Subject: [PATCH] Debugger: Simplify QByteArray dumper again Change-Id: Id2622db1e855c7706260796b633f06d0e5da0503 Reviewed-by: Christian Stenger --- share/qtcreator/debugger/qttypes.py | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/share/qtcreator/debugger/qttypes.py b/share/qtcreator/debugger/qttypes.py index f749fa83281..74314d7f1ca 100644 --- a/share/qtcreator/debugger/qttypes.py +++ b/share/qtcreator/debugger/qttypes.py @@ -68,11 +68,8 @@ def qdump__QByteArray(d, value): if size > 0: d.putExpandable() - if d.qtVersion() >= 0x60000: - elided, shown = d.computeLimit(size, d.displayStringLimit) - p = d.readMemory(data, shown) - else: - elided, p = d.encodeByteArrayHelper(value, d.displayStringLimit) + elided, shown = d.computeLimit(size, d.displayStringLimit) + p = d.readMemory(data, shown) displayFormat = d.currentItemFormat() if displayFormat == DisplayFormat.Automatic or displayFormat == DisplayFormat.Latin1String: