diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2022-12-07 10:47:47 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2022-12-07 10:47:47 +0100 |
| commit | b4fed03c27af94bfea812f2ca20e62749d5d8da1 (patch) | |
| tree | 7fca574d168cb200b2dc67144baeaa37d1653897 /tests | |
| parent | 76568d82328b1b2acfb3db7cb21679cce3d9b665 (diff) | |
| parent | f93404d405ed86a1e9b9825bc61e6b36c97783fa (diff) | |
| download | qt-creator-b4fed03c27af94bfea812f2ca20e62749d5d8da1.tar.gz | |
Merge remote-tracking branch 'origin/9.0'
Conflicts:
src/plugins/cppeditor/cppeditorplugin.cpp
src/plugins/docker/dockerdevice.cpp
Change-Id: I41747ff9490e4ab20340d4d4acb4655100aaa3d2
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/debugger/tst_dumpers.cpp | 8 | ||||
| -rw-r--r-- | tests/auto/debugger/tst_gdb.cpp | 8 |
2 files changed, 12 insertions, 4 deletions
diff --git a/tests/auto/debugger/tst_dumpers.cpp b/tests/auto/debugger/tst_dumpers.cpp index 39ec743104..752b22c2aa 100644 --- a/tests/auto/debugger/tst_dumpers.cpp +++ b/tests/auto/debugger/tst_dumpers.cpp @@ -4061,15 +4061,15 @@ void tst_Dumpers::dumper_data() + Check("list.0", "[0]", "1", "int") + Check("list.1", "[1]", "2", "int") + Check("list.2", "[2]", "3", "int") - + Check("v3", "", "@QVariant (@QList<int>)") % Qt5 + + Check("v3", "", "@QVariant (@QList<int>)") % NeedsInferiorCall % Qt5 + Check("v3.data", "<3 items>", TypePattern(".*QList<int>")) % NeedsInferiorCall % Qt5 + Check("v3.data.0", "[0]", "1", "int") % NeedsInferiorCall % Qt5 + Check("v3.data.1", "[1]", "2", "int") % NeedsInferiorCall % Qt5 + Check("v3.data.2", "[2]", "3", "int") % NeedsInferiorCall % Qt5 + Check("v3", "<3 items>", "@QVariant (@QList<int>)") % Qt6 - + Check("v3.0", "[0]", "1", "int") % NeedsInferiorCall % Qt6 - + Check("v3.1", "[1]", "2", "int") % NeedsInferiorCall % Qt6 - + Check("v3.2", "[2]", "3", "int") % NeedsInferiorCall % Qt6; + + Check("v3.0", "[0]", "1", "int") % Qt6 + + Check("v3.1", "[1]", "2", "int") % Qt6 + + Check("v3.2", "[2]", "3", "int") % Qt6; QTest::newRow("QVariant2") diff --git a/tests/auto/debugger/tst_gdb.cpp b/tests/auto/debugger/tst_gdb.cpp index 804c7d6339..f4d5ffa692 100644 --- a/tests/auto/debugger/tst_gdb.cpp +++ b/tests/auto/debugger/tst_gdb.cpp @@ -115,6 +115,14 @@ void tst_gdb::version_data() QTest::newRow("Debian 7.12 git") << "GNU gdb (Debian 7.12-6) 7.12.0.20161007-git" << 71200 << 6 << false << false; + + QTest::newRow("Debian 10.1 git") + << "GNU gdb (Debian 10.1-1.7) 10.1.90.20210103-git" + << 100100 << 1 << false << false; + + QTest::newRow("Ubuntu 22.04") + << "GNU gdb (Ubuntu 12.1-0ubuntu1~22.04) 12.1" + << 120100 << 0 << false << false; } static QString chopConst(QString type) |