diff options
| author | hjk <hjk@qt.io> | 2020-09-25 14:56:14 +0200 |
|---|---|---|
| committer | hjk <hjk@qt.io> | 2020-09-25 14:17:40 +0000 |
| commit | 950aa580abd5135a8f5c96b5265aedee9e426c7a (patch) | |
| tree | e78e8abff82a6ebea71b86060d3e9fa0b652c91d /tests/auto | |
| parent | 60c4dfb5e52ceb395f8618e4f3ef8967ee9ab793 (diff) | |
Debugger: Make QList test pass with Qt6
QStringList is a typedef now
Task-number: QTCREATORBUG-24098
Change-Id: I0f12655a9b86e4813245fbb08cc0a1c3e21d2dcf
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Diffstat (limited to 'tests/auto')
| -rw-r--r-- | tests/auto/debugger/tst_dumpers.cpp | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/tests/auto/debugger/tst_dumpers.cpp b/tests/auto/debugger/tst_dumpers.cpp index 0b8d2ae411..ddabe0aad6 100644 --- a/tests/auto/debugger/tst_dumpers.cpp +++ b/tests/auto/debugger/tst_dumpers.cpp @@ -630,6 +630,7 @@ struct CheckType : public Check const QtVersion Qt4 = QtVersion(0, 0x4ffff); const QtVersion Qt5 = QtVersion(0x50000, 0x5ffff); +const QtVersion Qt6 = QtVersion(0x60000, 0x6ffff); struct Check4 : Check { @@ -654,6 +655,17 @@ struct Check5 : Check }; +struct Check6 : Check +{ + Check6(const QByteArray &iname, const Value &value, const Type &type) + : Check(QString::fromUtf8(iname), value, type) + { qtVersionForCheck = Qt6; } + + Check6(const QByteArray &iname, const Name &name, const Value &value, const Type &type) + : Check(QString::fromUtf8(iname), name, value, type) + { qtVersionForCheck = Qt6; } + +}; struct Profile { Profile(const QByteArray &contents) : contents(contents) {} @@ -2631,9 +2643,11 @@ void tst_Dumpers::dumper_data() + Check("l7.0", "[0]", "101", "unsigned int") + Check("l7.2", "[2]", "102", "unsigned int") - + Check("l8", "<2 items>", "@QList<@QStringList>") + + Check5("l8", "<2 items>", "@QList<@QStringList>") + + Check6("l8", "<2 items>", "@QList<@QList<@QString>>") + Check("sl", "<1 items>", "@QStringList") - + Check("l8.1", "[1]", "<1 items>", "@QStringList") + + Check5("l8.1", "[1]", "<1 items>", "@QStringList") + + Check6("l8.1", "[1]", "<1 items>", "@QList<@QString>") + Check("l8.1.0", "[0]", "\"aaa\"", "@QString") + Check("l9", "<3 items>", "@QList<unsigned short>") |