diff options
Diffstat (limited to 'tests/auto/qgraphicslinearlayout/tst_qgraphicslinearlayout.cpp')
| -rw-r--r-- | tests/auto/qgraphicslinearlayout/tst_qgraphicslinearlayout.cpp | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/tests/auto/qgraphicslinearlayout/tst_qgraphicslinearlayout.cpp b/tests/auto/qgraphicslinearlayout/tst_qgraphicslinearlayout.cpp index a5d79de..4e46819 100644 --- a/tests/auto/qgraphicslinearlayout/tst_qgraphicslinearlayout.cpp +++ b/tests/auto/qgraphicslinearlayout/tst_qgraphicslinearlayout.cpp @@ -145,7 +145,11 @@ void tst_QGraphicsLinearLayout::initTestCase() { // since the style will influence the results, we have to ensure // that the tests are run using the same style on all platforms +#ifdef Q_WS_S60 + QApplication::setStyle(new QWindowsStyle); +#else QApplication::setStyle(new QPlastiqueStyle); +#endif } // This will be called after the last test function is executed. @@ -708,10 +712,10 @@ void tst_QGraphicsLinearLayout::itemAt_visualOrder() QGraphicsWidget *w2 = new QGraphicsWidget; l->insertItem(2, w2); - QCOMPARE(l->itemAt(0), w0); - QCOMPARE(l->itemAt(1), w1); - QCOMPARE(l->itemAt(2), w2); - QCOMPARE(l->itemAt(3), w3); + QCOMPARE(l->itemAt(0), static_cast<QGraphicsLayoutItem*>(w0)); + QCOMPARE(l->itemAt(1), static_cast<QGraphicsLayoutItem*>(w1)); + QCOMPARE(l->itemAt(2), static_cast<QGraphicsLayoutItem*>(w2)); + QCOMPARE(l->itemAt(3), static_cast<QGraphicsLayoutItem*>(w3)); } void tst_QGraphicsLinearLayout::orientation_data() |