diff options
author | Oliver Wolff <oliver.wolff@qt.io> | 2018-07-12 13:06:07 +0200 |
---|---|---|
committer | Oliver Wolff <oliver.wolff@qt.io> | 2018-08-06 05:24:38 +0000 |
commit | f51fc53844dcdf7a63b81b0abfd8ea553b9234ef (patch) | |
tree | 401f2fe2e1f85e192e9f46a7fb9c86dddb90c590 /tests/auto/widgets | |
parent | 0870e517c2be1b64a789d4b85d1cfc14dc5e1923 (diff) |
winrt: Fix tst_QGraphicsItem::cursor
By making the test independent of fixed top level widget sizes, it can
also be run on platforms, that do not support this feature.
Task-number: QTBUG-68297
Change-Id: I6945d259801360a9819b9b631d0a7497d3d27a9a
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Diffstat (limited to 'tests/auto/widgets')
-rw-r--r-- | tests/auto/widgets/graphicsview/qgraphicsitem/tst_qgraphicsitem.cpp | 22 |
1 files changed, 7 insertions, 15 deletions
diff --git a/tests/auto/widgets/graphicsview/qgraphicsitem/tst_qgraphicsitem.cpp b/tests/auto/widgets/graphicsview/qgraphicsitem/tst_qgraphicsitem.cpp index f6cc39dbde..1130a47260 100644 --- a/tests/auto/widgets/graphicsview/qgraphicsitem/tst_qgraphicsitem.cpp +++ b/tests/auto/widgets/graphicsview/qgraphicsitem/tst_qgraphicsitem.cpp @@ -4145,14 +4145,14 @@ void tst_QGraphicsItem::ensureVisible() #ifndef QT_NO_CURSOR void tst_QGraphicsItem::cursor() { -#ifdef Q_OS_WINRT - QSKIP("QTest::mouseMove does not work on WinRT - QTBUG-68297"); -#endif QGraphicsScene scene; - QGraphicsRectItem *item1 = scene.addRect(QRectF(0, 0, 50, 50)); - QGraphicsRectItem *item2 = scene.addRect(QRectF(0, 0, 50, 50)); - item1->setPos(-100, 0); - item2->setPos(50, 0); + QWidget topLevel; + QGraphicsView view(&scene,&topLevel); + topLevel.showMaximized(); + QVERIFY(QTest::qWaitForWindowExposed(&topLevel)); + view.setFixedSize(topLevel.size()); + QGraphicsRectItem *item1 = scene.addRect(QRectF(-100, 0, 50, 50)); + QGraphicsRectItem *item2 = scene.addRect(QRectF(50, 0, 50, 50)); QVERIFY(!item1->hasCursor()); QVERIFY(!item2->hasCursor()); @@ -4178,14 +4178,6 @@ void tst_QGraphicsItem::cursor() item1->setCursor(Qt::IBeamCursor); item2->setCursor(Qt::PointingHandCursor); - QWidget topLevel; - topLevel.resize(250, 150); - QTestPrivate::centerOnScreen(&topLevel); - QGraphicsView view(&scene,&topLevel); - view.setFixedSize(200, 100); - topLevel.show(); - QVERIFY(QTest::qWaitForWindowExposed(&topLevel)); - QTest::mouseMove(&view, view.rect().center()); const Qt::CursorShape viewportShape = view.viewport()->cursor().shape(); |