From f3830c68b1f50e671dde7ef3d68cde4827d3aeb5 Mon Sep 17 00:00:00 2001
From: David Schulz <david.schulz@qt.io>
Date: Thu, 26 Nov 2020 10:35:50 +0100
Subject: [PATCH] Debugger: Fix dumper test using QVector

QVector is a typedef to QList in Qt6 so cdb reports vector types as
QList<T>

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

diff --git a/tests/auto/debugger/tst_dumpers.cpp b/tests/auto/debugger/tst_dumpers.cpp
index 4cf08d3b924..8a4fc4b6cd1 100644
--- a/tests/auto/debugger/tst_dumpers.cpp
+++ b/tests/auto/debugger/tst_dumpers.cpp
@@ -4405,40 +4405,40 @@ void tst_Dumpers::dumper_data()
 
                + BigArrayProfile()
 
-               + Check("v1", "<10000 items>", "@QVector<int>")
+               + Check("v1", "<10000 items>", TypePattern("@QList<int>|@QVector<int>"))
                + Check("v1.0", "[0]", "0", "int")
                + Check("v1.8999", "[8999]", "80982001", "int")
 
-               + Check("v2", "<2 items>", "@QVector<Foo>")
+               + Check("v2", "<2 items>", TypePattern("@QList<Foo>|@QVector<Foo>"))
                + Check("v2.0", "[0]", "", "Foo")
                + Check("v2.0.a", "1", "int")
                + Check("v2.1", "[1]", "", "Foo")
                + Check("v2.1.a", "2", "int")
 
-               + Check("v3", "<2 items>", TypeDef("@QVector<Foo>", "FooVector"))
+               + Check("v3", "<2 items>", TypePattern("@QVector<Foo>|@QList<Foo>|FooVector"))
                + Check("v3.0", "[0]", "", "Foo")
                + Check("v3.0.a", "1", "int")
                + Check("v3.1", "[1]", "", "Foo")
                + Check("v3.1.a", "2", "int")
 
-               + Check("v4", "<3 items>", "@QVector<Foo*>")
+               + Check("v4", "<3 items>", TypePattern("@QList<Foo \\*>|@QVector<Foo\\*>"))
                + CheckType("v4.0", "[0]", "Foo")
                + Check("v4.0.a", "1", "int")
                + Check("v4.1", "[1]", "0x0", "Foo *")
                + CheckType("v4.2", "[2]", "Foo")
                + Check("v4.2.a", "5", "int")
 
-               + Check("v5", "<2 items>", "@QVector<bool>")
+               + Check("v5", "<2 items>", TypePattern("@QList<bool>|@QVector<bool>"))
                + Check("v5.0", "[0]", "1", "bool")
                + Check("v5.1", "[1]", "0", "bool")
 
-               + CheckType("pv", "@QVector<@QList<int>>")
+               + CheckType("pv", TypePattern("@QList<@QList<int>>|@QVector<@QList<int>>"))
                + Check("pv.0", "[0]", "<1 items>", "@QList<int>")
                + Check("pv.0.0", "[0]", "1", "int")
                + Check("pv.1", "[1]", "<2 items>", "@QList<int>")
                + Check("pv.1.0", "[0]", "2", "int")
                + Check("pv.1.1", "[1]", "3", "int")
-               + Check("v6", "<2 items>", "@QVector<@QList<int>>")
+               + Check("v6", "<2 items>", TypePattern("@QList<@QList<int>>|@QVector<@QList<int>>"))
                + Check("v6.0", "[0]", "<1 items>", "@QList<int>")
                + Check("v6.0.0", "[0]", "1", "int")
                + Check("v6.1", "[1]", "<2 items>", "@QList<int>")