tst_qquickpopup: Fix click position and wait for transitions to finish

- Take into account the menu coordinates when clicking menu item
- In closeOnEscapeWithNestedPopups wait for the Options menu to close
before interacting with the dialog

Change-Id: Ide182bdb44ca642322b09771f0a2bd52d98338bc
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
(cherry picked from commit f52d4cf2c0242d2b13990553a28bfde950fa05ce)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>

1 files changed, 2 insertions, 1 deletions

diff --git a/tests/auto/quickcontrols2/qquickpopup/tst_qquickpopup.cpp b/tests/auto/quickcontrols2/qquickpopup/tst_qquickpopup.cpp
index d86344e3ae..5b14c6b867 100644
--- a/tests/auto/quickcontrols2/qquickpopup/tst_qquickpopup.cpp
+++ b/tests/auto/quickcontrols2/qquickpopup/tst_qquickpopup.cpp
@@ -1163,7 +1163,7 @@ void tst_QQuickPopup::grabber()
     QCOMPARE(combo->isVisible(), false);
 
     // click a menu item to open the popup
-    QTest::mouseClick(window, Qt::LeftButton, Qt::NoModifier, QPoint(menu->width() / 2, menu->height() / 2));
+    QTest::mouseClick(window, Qt::LeftButton, Qt::NoModifier, QPoint(menu->x() + menu->width() / 2, menu->y() + menu->height() / 2));
     QTRY_COMPARE(menu->isVisible(), false);
     QTRY_COMPARE(popup->isOpened(), true);
     QCOMPARE(combo->isVisible(), false);
@@ -1292,6 +1292,7 @@ void tst_QQuickPopup::closeOnEscapeWithNestedPopups()
 
     QQuickPopup *settingsDialog = window->contentItem()->findChild<QQuickPopup*>("settingsDialog");
     QVERIFY(settingsDialog);
+    QTRY_VERIFY(!optionsMenu->isVisible());
     QTRY_VERIFY(settingsDialog->isOpened());
 
     QQuickComboBox *comboBox = window->contentItem()->findChild<QQuickComboBox*>("comboBox");