1 files changed, 10 insertions, 1 deletions
diff --git a/tests/auto/drawer/tst_drawer.cpp b/tests/auto/drawer/tst_drawer.cpp
index 80385421..58a5ba3c 100644
--- a/tests/auto/drawer/tst_drawer.cpp
+++ b/tests/auto/drawer/tst_drawer.cpp
@@ -452,6 +452,10 @@ void tst_Drawer::hover()
     QVERIFY(drawer);
     drawer->setModal(modal);
 
+    QQuickControl *drawerItem = qobject_cast<QQuickControl *>(drawer->popupItem());
+    QVERIFY(drawerItem);
+    QVERIFY(drawerItem->isHoverEnabled());
+
     QQuickButton *backgroundButton = window->property("backgroundButton").value<QQuickButton*>();
     QVERIFY(backgroundButton);
     backgroundButton->setHoverEnabled(true);
@@ -469,16 +473,19 @@ void tst_Drawer::hover()
     QTest::mouseMove(window, QPoint(window->width() - 1, window->height() - 1));
     QCOMPARE(backgroundButton->isHovered(), !modal);
     QVERIFY(!drawerButton->isHovered());
+    QVERIFY(!drawerItem->isHovered());
 
     // hover the drawer background
     QTest::mouseMove(window, QPoint(1, 1));
     QVERIFY(!backgroundButton->isHovered());
     QVERIFY(!drawerButton->isHovered());
+    QVERIFY(drawerItem->isHovered());
 
     // hover the button in a drawer
     QTest::mouseMove(window, QPoint(2, 2));
     QVERIFY(!backgroundButton->isHovered());
     QVERIFY(drawerButton->isHovered());
+    QVERIFY(drawerItem->isHovered());
 
     QSignalSpy closedSpy(drawer, SIGNAL(closed()));
     QVERIFY(closedSpy.isValid());
@@ -488,6 +495,8 @@ void tst_Drawer::hover()
     // hover the background button after closing the drawer
     QTest::mouseMove(window, QPoint(window->width() / 2, window->height() / 2));
     QVERIFY(backgroundButton->isHovered());
+    QVERIFY(!drawerButton->isHovered());
+    QVERIFY(!drawerItem->isHovered());
 }
 
 void tst_Drawer::wheel_data()
@@ -739,7 +748,7 @@ void tst_Drawer::touch()
     QTest::touchEvent(window, device.data()).move(0, QPoint(300 - drawer->dragMargin(), 100));
     for (int x = 300; x > 100; x -= 10) {
         QTest::touchEvent(window, device.data()).move(0, QPoint(x, 100));
-        QQuickWindowPrivate::get(window)->flushDelayedTouchEvent();
+        QQuickWindowPrivate::get(window)->flushFrameSynchronousEvents();
     }
     QTest::touchEvent(window, device.data()).move(0, QPoint(100, 100));
     QTRY_COMPARE(drawer->position(), 0.5);