From b00bb2c57c6a808ce36ec732ec4e965036dcc0ca Mon Sep 17 00:00:00 2001 From: hjk Date: Fri, 7 Jun 2013 08:49:01 +0200 Subject: [PATCH] Debugger: Make QLocale dumper test pass Still requires an inferior call. Change-Id: I98000f0236ec09094e7792f8d6fa3e156f324fcb Reviewed-by: hjk --- share/qtcreator/dumper/qttypes.py | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/share/qtcreator/dumper/qttypes.py b/share/qtcreator/dumper/qttypes.py index dba7c9cede0..f96903b4af9 100644 --- a/share/qtcreator/dumper/qttypes.py +++ b/share/qtcreator/dumper/qttypes.py @@ -761,18 +761,21 @@ def qdump__QLocale(d, value): # QLocale data array from variable in qlocale.cpp. # Default is 368 in Qt 4.8, 438 in Qt 5.0.1, the last one # being 'System'. - global qqLocalesCount - if qqLocalesCount is None: - try: - qqLocalesCount = int(value(d.ns + 'locale_data_size')) - except: - qqLocalesCount = 438 - try: - index = int(value["p"]["index"]) - except: - index = int(value["d"]["d"]["m_index"]) - check(index >= 0) - check(index <= qqLocalesCount) + #global qqLocalesCount + #if qqLocalesCount is None: + # #try: + # qqLocalesCount = int(value(d.ns + 'locale_data_size')) + # #except: + # qqLocalesCount = 438 + #try: + # index = int(value["p"]["index"]) + #except: + # try: + # index = int(value["d"]["d"]["m_index"]) + # except: + # index = int(value["d"]["d"]["m_data"]...) + #check(index >= 0) + #check(index <= qqLocalesCount) d.putStringValue(call(value, "name")) d.putNumChild(0) return