diff options
Diffstat (limited to 'tests/auto/modelview')
-rw-r--r-- | tests/auto/modelview/modeltest.cpp | 4 | ||||
-rw-r--r-- | tests/auto/modelview/tst_modelview.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/tests/auto/modelview/modeltest.cpp b/tests/auto/modelview/modeltest.cpp index 9abf878..859d883 100644 --- a/tests/auto/modelview/modeltest.cpp +++ b/tests/auto/modelview/modeltest.cpp @@ -443,12 +443,12 @@ void ModelTest::data() } // General Purpose roles that should return a QColor - QVariant colorVariant = model->data ( model->index ( 0, 0 ), Qt::BackgroundColorRole ); + QVariant colorVariant = model->data ( model->index ( 0, 0 ), Qt::BackgroundRole ); if ( colorVariant.isValid() ) { QVERIFY( colorVariant.canConvert<QColor>() ); } - colorVariant = model->data ( model->index ( 0, 0 ), Qt::TextColorRole ); + colorVariant = model->data ( model->index ( 0, 0 ), Qt::ForegroundRole ); if ( colorVariant.isValid() ) { QVERIFY( colorVariant.canConvert<QColor>() ); } diff --git a/tests/auto/modelview/tst_modelview.cpp b/tests/auto/modelview/tst_modelview.cpp index da42763..78e75ca 100644 --- a/tests/auto/modelview/tst_modelview.cpp +++ b/tests/auto/modelview/tst_modelview.cpp @@ -733,7 +733,7 @@ void TestModelView::testFlags() for (int i = 10; i < 20; ++i) { QStandardItem* firstItem = m_sourceModel.item(i, 0); QStandardItem* secondItem = m_sourceModel.item(i, 1); - firstItem->setFlags(firstItem->flags() | Qt::ItemIsEnabled | Qt::ItemIsTristate); + firstItem->setFlags(firstItem->flags() | Qt::ItemIsEnabled | Qt::ItemIsAutoTristate); secondItem->setFlags(firstItem->flags() | Qt::ItemIsEnabled); } bool signalsReceived = false; |