feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Debugger: Remove QLinkedList occurrences from manual tests

Browse Source 
And restrict the auto test to Qt<6.

Task-number: QTCREATORBUG-24098
Change-Id: Idfbe94bc1a4b2d5a8c23a07a031520775bb17cd3
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
hjk
2020-06-18 13:01:56 +02:00
parent da829f3fe7
commit dd9519b1c4
3 changed files with 1 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/auto/debugger/tst_dumpers.cpp
+1
View File
@@ -2478,6 +2478,7 @@ void tst_Dumpers::dumper_data()
"&l1, &l2, &l3, &l4, &l5, &l6")
+ CoreProfile()
+ QtVersion(0, 0x5ffff) // QLinkedList was dropped in Qt 6
+ Check("l0", "<0 items>", "@QLinkedList<float>")
tests/manual/debugger/gui/mainwindow.cpp
-3
View File
@@ -46,7 +46,6 @@
#include <QFileInfo>
#include <QSharedPointer>
#include <QDir>
#include <QLinkedList>
#include <QStandardItemModel>
struct TestClass {
@@ -306,8 +305,6 @@ void MainWindow::on_actionExtTypes_triggered()
qDebug() << hidden;
}
QLinkedList<QString> lls;
lls << "link1" << "link2";
QStandardItemModel *model =new QStandardItemModel;
model->appendRow(new QStandardItem("i1"));
tests/manual/debugger/simple/simple_test_app.cpp
-107
View File
@@ -154,7 +154,6 @@ void dummyStatement(...) {}
#include <QDir>
#include <QHash>
#include <QLibrary>
#include <QLinkedList>
#include <QList>
#include <QMap>
#include <QPointer>
@@ -1163,111 +1162,6 @@ namespace painting {
} // namespace painting
namespace qlinkedlist {
void testQLinkedListInt()
{
QLinkedList<int> list;
list.append(101);
list.append(102);
BREAK_HERE;
// Expand list.
// Check list <2 items> QLinkedList<int>.
// Check list.0 101 int.
// Check list.1 102 int.
// Continue.
dummyStatement(&list);
}
void testQLinkedListUInt()
{
QLinkedList<uint> list;
list.append(103);
list.append(104);
BREAK_HERE;
// Expand list.
// Check list <2 items> QLinkedList<unsigned int>.
// Check list.0 103 unsigned int.
// Check list.1 104 unsigned int.
// Continue.
dummyStatement(&list);
}
void testQLinkedListFooStar()
{
QLinkedList<Foo *> list;
list.append(new Foo(1));
list.append(0);
list.append(new Foo(3));
BREAK_HERE;
// Expand list list.0 list.2.
// Check list <3 items> QLinkedList<Foo*>.
// CheckType list.0 Foo.
// Check list.0.a 1 int.
// Check list.1 0x0 Foo *.
// CheckType list.2 Foo.
// Check list.2.a 3 int.
// Continue.
dummyStatement(&list);
}
void testQLinkedListULongLong()
{
QLinkedList<qulonglong> list;
list.append(42);
list.append(43);
BREAK_HERE;
// Expand list.
// Check list <2 items> QLinkedList<unsigned long long>.
// Check list.0 42 unsigned long long.
// Check list.1 43 unsigned long long.
// Continue.
dummyStatement(&list);
}
void testQLinkedListFoo()
{
QLinkedList<Foo> list;
list.append(Foo(1));
list.append(Foo(2));
BREAK_HERE;
// Expand list list.0 list.1.
// Check list <2 items> QLinkedList<Foo>.
// CheckType list.0 Foo.
// Check list.0.a 1 int.
// CheckType list.1 Foo.
// Check list.1.a 2 int.
// Continue.
dummyStatement(&list);
}
void testQLinkedListStdString()
{
QLinkedList<std::string> list;
list.push_back("aa");
list.push_back("bb");
BREAK_HERE;
// Expand list.
// Check list <2 items> QLinkedList<std::string>.
// Check list.0 "aa" std::string.
// Check list.1 "bb" std::string.
// Continue.
dummyStatement(&list);
}
void testQLinkedList()
{
testQLinkedListInt();
testQLinkedListUInt();
testQLinkedListFooStar();
testQLinkedListULongLong();
testQLinkedListFoo();
testQLinkedListStdString();
}
} // namespace qlinkedlist
namespace qlist {
void testQListInt()
@@ -7290,7 +7184,6 @@ int main(int argc, char *argv[])
qdir::testQDir();
qfileinfo::testQFileInfo();
qhash::testQHash();
qlinkedlist::testQLinkedList();
qlist::testQList();
qlocale::testQLocale();
qmap::testQMap();