From e6873b5b2417ebddef8a24d3b7145aebc4449ada Mon Sep 17 00:00:00 2001
From: David Schulz <david.schulz@qt.io>
Date: Thu, 26 Nov 2020 10:08:53 +0100
Subject: Debugger: adjust QStringList dumper test for qt6

QStringList is a typedef in qt 6 so cdb reports the type as
QList<QString> now.

Change-Id: I9660935dfb26a2a765411acdec1a3478357040fe
Reviewed-by: hjk <hjk@qt.io>
---
 tests/auto/debugger/tst_dumpers.cpp | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/tests/auto/debugger/tst_dumpers.cpp b/tests/auto/debugger/tst_dumpers.cpp
index aed514301f..4cf08d3b92 100644
--- a/tests/auto/debugger/tst_dumpers.cpp
+++ b/tests/auto/debugger/tst_dumpers.cpp
@@ -2704,7 +2704,7 @@ void tst_Dumpers::dumper_data()
                + Check("l3", "<2 items>", "@QList<@QString>")
                + Check("l3.0", "[0]", "\"1\"", "@QString")
 
-               + Check("l4", "<2 items>", "@QStringList")
+               + Check("l4", "<2 items>", TypePattern("@QList<@QString>|@QStringList"))
                + Check("l4.0", "[0]", "\"1\"", "@QString")
 
                + Check("l5", "<3 items>", "@QList<int*>")
@@ -2721,7 +2721,7 @@ void tst_Dumpers::dumper_data()
 
                + Check5("l8", "<2 items>", "@QList<@QStringList>")
                + Check6("l8", "<2 items>", "@QList<@QList<@QString>>")
-               + Check("sl", "<1 items>", "@QStringList")
+               + Check("sl", "<1 items>", TypePattern("@QList<@QString>|@QStringList"))
                + Check5("l8.1", "[1]", "<1 items>", "@QStringList")
                + Check6("l8.1", "[1]", "<1 items>", "@QList<@QString>")
                + Check("l8.1.0", "[0]", "\"aaa\"", "@QString")
@@ -3904,7 +3904,7 @@ void tst_Dumpers::dumper_data()
                + Check("s8", "\"el\"", "@QStringRef") % Qt5
                + Check("s9", "(null)", "@QStringRef") % Qt5
 
-               + Check("l", "<2 items>", "@QStringList")
+               + Check("l", "<2 items>", TypePattern("@QList<@QString>|@QStringList"))
                + Check("l.0", "[0]", "\" big, \"", "@QString")
                + Check("l.1", "[1]", "\" World \"", "@QString")
 
@@ -4042,12 +4042,12 @@ void tst_Dumpers::dumper_data()
                //+ Check("v1", "\"Some string\"", "@QVariant (QString)")
                + CheckType("v1", "@QVariant (QString)")
 
-               + Check("my", "<2 items>", TypeDef("@QMap<unsigned int,@QStringList>", "MyType"))
+               + Check("my", "<2 items>", TypePattern("@QMap<unsigned int,@QStringList>|@QMap<unsigned int,@List<@QString>>|MyType"))
                + Check("my.0.key", "1", "unsigned int")
-               + Check("my.0.value", "<1 items>", "@QStringList")
+               + Check("my.0.value", "<1 items>", TypePattern("@QList<@QString>|@QStringList"))
                + Check("my.0.value.0", "[0]", "\"Hello\"", "@QString")
                + Check("my.1.key", "3", "unsigned int")
-               + Check("my.1.value", "<1 items>", "@QStringList")
+               + Check("my.1.value", "<1 items>", TypePattern("@QList<@QString>|@QStringList"))
                + Check("my.1.value.0", "[0]", "\"World\"", "@QString")
                //+ CheckType("v2", "@QVariant (MyType)")
                + Check("v2.data.0.key", "1", "unsigned int") % NeedsInferiorCall
@@ -4931,14 +4931,14 @@ void tst_Dumpers::dumper_data()
                + Check("map2.1.second", "", "Foo")
                + Check("map2.1.second.a", "33", "int")
 
-               + Check("map3", "<2 items>", "std::map<unsigned int, @QStringList>")
+               + Check("map3", "<2 items>", TypePattern("std::map<unsigned int, @QList<@QString>>|std::map<unsigned int, @QStringList>"))
                + Check("map3.0", "[0] 11", "<1 items>", "")
                + Check("map3.0.first", "11", "unsigned int")
-               + Check("map3.0.second", "<1 items>", "@QStringList")
+               + Check("map3.0.second", "<1 items>", TypePattern("@QList<@QString>|@QStringList"))
                + Check("map3.0.second.0", "[0]", "\"11\"", "@QString")
                + Check("map3.1", "[1] 22", "<1 items>", "")
                + Check("map3.1.first", "22", "unsigned int")
-               + Check("map3.1.second", "<1 items>", "@QStringList")
+               + Check("map3.1.second", "<1 items>", TypePattern("@QList<@QString>|@QStringList"))
                + Check("map3.1.second.0", "[0]", "\"22\"", "@QString")
 
                + Check("map4.1.second.0", "[0]", "\"22\"", "@QString")
@@ -6611,7 +6611,7 @@ void tst_Dumpers::dumper_data()
              + Check("i0", "<uninitialized>", "boost::optional<int>")
              + Check("i1", "1", "boost::optional<int>")
 
-             + Check("sl", "<3 items>", "boost::optional<@QStringList>");
+             + Check("sl", "<3 items>", TypePattern("boost::optional<@QList<@QString>>|boost::optional<@QStringList>"));
 
 
     QTest::newRow("BoostSharedPtr")
-- 
cgit v1.2.3