feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Debugger: Fix QLocale dumper and autotest

Browse Source 
Change-Id: Icf304a2fee681622b4126ddf5b373f0dfd3e03ac
Reviewed-by: hjk <hjk121@nokiamail.com>
This commit is contained in:
hjk
2013-02-11 17:06:39 +01:00
parent 578d60d574
commit b0fce02f1c
2 changed files with 22 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
share/qtcreator/dumper/qttypes.py
View File

@@ -636,16 +636,22 @@ def qdump__QLinkedList(d, value):
qqLocalesCount = None qqLocalesCount = None
def qdump__QLocale(d, value): def qdump__QLocale(d, value):
# Check for uninitialized 'index' variable. Retrieve size of QLocale data array # Check for uninitialized 'index' variable. Retrieve size of
# from variable in qlocale.cpp (default: 368/Qt 4.8), 368 being 'System'. # 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 global qqLocalesCount
if qqLocalesCount is None: if qqLocalesCount is None:
try: try:
qqLocalesCount = int(value(qtNamespace() + 'locale_data_size')) qqLocalesCount = int(value(d.ns + 'locale_data_size'))
except: except:
qqLocalesCount = 368 qqLocalesCount = 438
index = int(value["p"]["index"]) try:
check(index >= 0 and index <= qqLocalesCount) index = int(value["p"]["index"])
except:
index = int(value["d"]["d"]["m_index"])
check(index >= 0)
check(index <= qqLocalesCount)
d.putStringValue(call(value, "name")) d.putStringValue(call(value, "name"))
d.putNumChild(0) d.putNumChild(0)
return return

13
tests/auto/debugger/tst_dumpers.cpp
View File

@@ -1244,12 +1244,19 @@ void tst_Dumpers::dumper_data()
QTest::newRow("QLocale") QTest::newRow("QLocale")
<< Data("#include <QLocale>\n", << Data("#include <QLocale>\n",
"QLocale loc0;\n"
"QLocale loc = QLocale::system();\n" "QLocale loc = QLocale::system();\n"
"QLocale::MeasurementSystem m = loc.measurementSystem();\n" "QLocale::MeasurementSystem m = loc.measurementSystem();\n"
"unused(&m);\n") "QLocale loc1(\"en_US\");\n"
"QLocale::MeasurementSystem m1 = loc1.measurementSystem();\n"
"unused(&loc0, &loc, &m, &loc1, &m1);\n")
% CoreProfile() % CoreProfile()
% Check("loc", "", "@QLocale") % Check("loc0", "\"en_US\"", "@QLocale")
% Check("m", "", "@QLocale::MeasurementSystem"); % CheckType("loc", "@QLocale")
% CheckType("m", "@QLocale::MeasurementSystem")
% Check("loc1", "\"en_US\"", "@QLocale")
% Check("m1", Value5("@QLocale::ImperialUSSystem (1)"), "@QLocale::MeasurementSystem")
% Check("m1", Value4("@QLocale::ImperialSystem (1)"), "@QLocale::MeasurementSystem");
QTest::newRow("QMapUIntStringList") QTest::newRow("QMapUIntStringList")