1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use ItemIsUserTristate instead of ItemIsTristate in table & list tests.

Browse Source 
ItemIsTristate only makes sense in tree widgets, where it triggers the
auto-tristate behavior between parents and children.

Change-Id: Idfa8bb5d0b9c63fe450115fb58d088929e11c7ff
Reviewed-by: Jarek Kobus <jaroslaw.kobus@theqtcompany.com>
This commit is contained in:
David Faure 2015-05-06 17:00:59 +02:00
parent f1bfc4266b
commit cca5cce205
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tests/auto/widgets/itemviews/qlistwidget/tst_qlistwidget.cpp
View File

@ -605,21 +605,21 @@ void tst_QListWidget::insertItems()
void tst_QListWidget::itemAssignment() void tst_QListWidget::itemAssignment()
{ {
QListWidgetItem itemInWidget("inWidget", testWidget); QListWidgetItem itemInWidget("inWidget", testWidget);
itemInWidget.setFlags(itemInWidget.flags() | Qt::ItemIsTristate); itemInWidget.setFlags(itemInWidget.flags() | Qt::ItemIsUserTristate);
QListWidgetItem itemOutsideWidget("outsideWidget"); QListWidgetItem itemOutsideWidget("outsideWidget");
QVERIFY(itemInWidget.listWidget()); QVERIFY(itemInWidget.listWidget());
QCOMPARE(itemInWidget.text(), QString("inWidget")); QCOMPARE(itemInWidget.text(), QString("inWidget"));
QVERIFY(itemInWidget.flags() & Qt::ItemIsTristate); QVERIFY(itemInWidget.flags() & Qt::ItemIsUserTristate);
QVERIFY(!itemOutsideWidget.listWidget()); QVERIFY(!itemOutsideWidget.listWidget());
QCOMPARE(itemOutsideWidget.text(), QString("outsideWidget")); QCOMPARE(itemOutsideWidget.text(), QString("outsideWidget"));
QVERIFY(!(itemOutsideWidget.flags() & Qt::ItemIsTristate)); QVERIFY(!(itemOutsideWidget.flags() & Qt::ItemIsUserTristate));
itemOutsideWidget = itemInWidget; itemOutsideWidget = itemInWidget;
QVERIFY(!itemOutsideWidget.listWidget()); QVERIFY(!itemOutsideWidget.listWidget());
QCOMPARE(itemOutsideWidget.text(), QString("inWidget")); QCOMPARE(itemOutsideWidget.text(), QString("inWidget"));
QVERIFY(itemOutsideWidget.flags() & Qt::ItemIsTristate); QVERIFY(itemOutsideWidget.flags() & Qt::ItemIsUserTristate);
} }
void tst_QListWidget::item_data() void tst_QListWidget::item_data()

8
tests/auto/widgets/itemviews/qtablewidget/tst_qtablewidget.cpp
View File

@ -281,21 +281,21 @@ void tst_QTableWidget::itemAssignment()
{ {
QTableWidgetItem itemInWidget("inWidget"); QTableWidgetItem itemInWidget("inWidget");
testWidget->setItem(0, 0, &itemInWidget); testWidget->setItem(0, 0, &itemInWidget);
itemInWidget.setFlags(itemInWidget.flags() | Qt::ItemIsTristate); itemInWidget.setFlags(itemInWidget.flags() | Qt::ItemIsUserTristate);
QTableWidgetItem itemOutsideWidget("outsideWidget"); QTableWidgetItem itemOutsideWidget("outsideWidget");
QVERIFY(itemInWidget.tableWidget()); QVERIFY(itemInWidget.tableWidget());
QCOMPARE(itemInWidget.text(), QString("inWidget")); QCOMPARE(itemInWidget.text(), QString("inWidget"));
QVERIFY(itemInWidget.flags() & Qt::ItemIsTristate); QVERIFY(itemInWidget.flags() & Qt::ItemIsUserTristate);
QVERIFY(!itemOutsideWidget.tableWidget()); QVERIFY(!itemOutsideWidget.tableWidget());
QCOMPARE(itemOutsideWidget.text(), QString("outsideWidget")); QCOMPARE(itemOutsideWidget.text(), QString("outsideWidget"));
QVERIFY(!(itemOutsideWidget.flags() & Qt::ItemIsTristate)); QVERIFY(!(itemOutsideWidget.flags() & Qt::ItemIsUserTristate));
itemOutsideWidget = itemInWidget; itemOutsideWidget = itemInWidget;
QVERIFY(!itemOutsideWidget.tableWidget()); QVERIFY(!itemOutsideWidget.tableWidget());
QCOMPARE(itemOutsideWidget.text(), QString("inWidget")); QCOMPARE(itemOutsideWidget.text(), QString("inWidget"));
QVERIFY(itemOutsideWidget.flags() & Qt::ItemIsTristate); QVERIFY(itemOutsideWidget.flags() & Qt::ItemIsUserTristate);
} }
void tst_QTableWidget::item_data() void tst_QTableWidget::item_data()