summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorhjk <hjk121@nokiamail.com>2014-09-12 13:31:12 +0200
committerChristian Stenger <christian.stenger@digia.com>2014-09-26 09:35:36 +0200
commitbf5f14a4e1941965019fc378cd2dc312231940b1 (patch)
tree62062dfc6e7acfce69c1b5bb10c814fdd26550c8 /tests
parenta4321bbfe14d8e041f45840468d7ea18f0d3f97b (diff)
downloadqt-creator-bf5f14a4e1941965019fc378cd2dc312231940b1.tar.gz
Debugger: Fix QHash display of "compact" keys
Add make std::string usable as "compact" key. Change-Id: Idbfcf9d299e2dde392025166a20c3d0ab60239a6 (cherry picked from commit 2776536a7efd6758de1d6720b2c05a9fe0bc65a5) Reviewed-by: Christian Stenger <christian.stenger@digia.com>
Diffstat (limited to 'tests')
-rw-r--r--tests/auto/debugger/tst_dumpers.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/auto/debugger/tst_dumpers.cpp b/tests/auto/debugger/tst_dumpers.cpp
index 412656a7fc..96737a42b5 100644
--- a/tests/auto/debugger/tst_dumpers.cpp
+++ b/tests/auto/debugger/tst_dumpers.cpp
@@ -1658,8 +1658,8 @@ void tst_Dumpers::dumper_data()
+ Check("h1.2.value.1", "[1]", "2", "int")
+ Check("h2", "<2 items>", "@QHash<int, float>")
- + Check("h2.22", "[22]", "22", "float")
- + Check("h2.11", "[11]", "11", "float")
+ + Check("h2.0", "[0] 22", "22", "float")
+ + Check("h2.1", "[1] 11", "11", "float")
+ Check("h3", "<9 items>", "@QHash<@QString, int>")
+ Check("h3.0", "[0]", "", "@QHashNode<@QString, int>")
@@ -1713,7 +1713,7 @@ void tst_Dumpers::dumper_data()
+ CheckType("h7.2.value", "@QPointer<@QObject>")
+ Check("h8", "<3 items>", "Hash")
- + Check("h8.11", "[11]", "11", "float")
+ + Check("h8.0", "[0] 22", "22", "float")
+ Check("it1.key", "22", "int")
+ Check("it1.value", "22", "float")
+ Check("it3.key", "33", "int")