diff --git a/tests/modeltest.cpp b/tests/modeltest.cpp index 20bfcc2a0..a68021a64 100644 --- a/tests/modeltest.cpp +++ b/tests/modeltest.cpp @@ -418,27 +418,27 @@ void ModelTest::data() // General Purpose roles that should return a QString QVariant variant = model->data ( model->index ( 0, 0 ), Qt::ToolTipRole ); if ( variant.isValid() ) { - QVERIFY( qVariantCanConvert ( variant ) ); + QVERIFY( variant.canConvert() ); } variant = model->data ( model->index ( 0, 0 ), Qt::StatusTipRole ); if ( variant.isValid() ) { - QVERIFY( qVariantCanConvert ( variant ) ); + QVERIFY( variant.canConvert() ); } variant = model->data ( model->index ( 0, 0 ), Qt::WhatsThisRole ); if ( variant.isValid() ) { - QVERIFY( qVariantCanConvert ( variant ) ); + QVERIFY( variant.canConvert() ); } // General Purpose roles that should return a QSize variant = model->data ( model->index ( 0, 0 ), Qt::SizeHintRole ); if ( variant.isValid() ) { - QVERIFY( qVariantCanConvert ( variant ) ); + QVERIFY( variant.canConvert() ); } // General Purpose roles that should return a QFont QVariant fontVariant = model->data ( model->index ( 0, 0 ), Qt::FontRole ); if ( fontVariant.isValid() ) { - QVERIFY( qVariantCanConvert ( fontVariant ) ); + QVERIFY( fontVariant.canConvert() ); } // Check that the alignment is one we know about @@ -451,12 +451,12 @@ void ModelTest::data() // General Purpose roles that should return a QColor QVariant colorVariant = model->data ( model->index ( 0, 0 ), Qt::BackgroundColorRole ); if ( colorVariant.isValid() ) { - QVERIFY( qVariantCanConvert ( colorVariant ) ); + QVERIFY( colorVariant.canConvert() ); } colorVariant = model->data ( model->index ( 0, 0 ), Qt::TextColorRole ); if ( colorVariant.isValid() ) { - QVERIFY( qVariantCanConvert ( colorVariant ) ); + QVERIFY( colorVariant.canConvert() ); } // Check that the "check state" is one we know about.