diff options
| author | hjk <hjk@theqtcompany.com> | 2015-04-02 14:10:26 +0200 |
|---|---|---|
| committer | hjk <hjk@theqtcompany.com> | 2015-04-02 14:07:24 +0000 |
| commit | e6f73164c3557b0b6b5c4d8be4fecc7472b5552d (patch) | |
| tree | d7938cdbdb2ac6550fdf8d2a99b0f61f1ee910ce | |
| parent | 4deadb5f8bf476018736c44806cc4fac5a189810 (diff) | |
| download | qt-creator-e6f73164c3557b0b6b5c4d8be4fecc7472b5552d.tar.gz | |
Debugger: Adjust QVariant2 dumper test
Take new QPolygon{,F} dumpers into account, also make QUrlPrivate
field accessible,
Change-Id: I2b5c122895c3ee389ba939eaeffcd613fa206009
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
| -rw-r--r-- | share/qtcreator/debugger/qttypes.py | 1 | ||||
| -rw-r--r-- | tests/auto/debugger/tst_dumpers.cpp | 6 |
2 files changed, 4 insertions, 3 deletions
diff --git a/share/qtcreator/debugger/qttypes.py b/share/qtcreator/debugger/qttypes.py index 8323314d34..031c72bf48 100644 --- a/share/qtcreator/debugger/qttypes.py +++ b/share/qtcreator/debugger/qttypes.py @@ -1906,6 +1906,7 @@ def qdump__QUrl(d, value): d.putGenericItem("path", stringType, path, Hex4EncodedLittleEndian) d.putGenericItem("query", stringType, query, Hex4EncodedLittleEndian) d.putGenericItem("fragment", stringType, fragment, Hex4EncodedLittleEndian) + d.putFields(value) def qdumpHelper_QVariant_0(d, blob): # QVariant::Invalid diff --git a/tests/auto/debugger/tst_dumpers.cpp b/tests/auto/debugger/tst_dumpers.cpp index 3cbc36bddb..d13b7757ac 100644 --- a/tests/auto/debugger/tst_dumpers.cpp +++ b/tests/auto/debugger/tst_dumpers.cpp @@ -3321,7 +3321,7 @@ void tst_Dumpers::dumper_data() + Check("var14", "(invalid)", "@QVariant (QDate)") + Check("var15", "(invalid)", "@QVariant (QTime)") + Check("var16", "(invalid)", "@QVariant (QDateTime)") - + Check4("var17.d", "", "@QUrlPrivate") + + Check("var17.d", "", "@QUrlPrivate") + Check5("var17", UnsubstitutedValue("\"http://foo@qt-project.org:10/have_fun\""), "@QVariant (QUrl)") + Check("var17.port", "10", "int") + Check("var18", "\"en_US\"", "@QVariant (QLocale)") @@ -3350,7 +3350,7 @@ void tst_Dumpers::dumper_data() + Check("var68", "", "@QVariant (QPalette)") + Check("var69", "", "@QVariant (QIcon)") + Check("var70", "(invalid)", "@QVariant (QImage)") - + Check("var71", "", "@QVariant (QPolygon)") + + Check("var71", "<0 items>", "@QVariant (QPolygon)") //+ Check("var72", "", "@QVariant (QRegion)") FIXME + Check("var73", "", "@QVariant (QBitmap)") + Check("var74", "", "@QVariant (QCursor)") @@ -3364,7 +3364,7 @@ void tst_Dumpers::dumper_data() + Check("var83", "", "@QVariant (QVector3D)") + Check("var84", "", "@QVariant (QVector4D)") + Check("var85", "", "@QVariant (QQuaternion)") - + Check("var86", "", "@QVariant (QPolygonF)"); + + Check("var86", "<0 items>", "@QVariant (QPolygonF)"); QTest::newRow("QVariant4") |