diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-07-27 03:01:14 +0200 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-07-27 03:01:15 +0200 |
commit | 2a5dcd00695db51c37a8f5f92c14b4a816c6780d (patch) | |
tree | 4bd595d962542bb19a03b937317746320a23dbf0 /tests | |
parent | 25531b3d91311c1362b11f3465109b809809d2e4 (diff) | |
parent | 200b47519ffc61ebd06cda9a4c452d7b15e37d33 (diff) |
Merge remote-tracking branch 'origin/5.13' into dev
Change-Id: Ic804e1279f39b1bc09f9d45b2b3415067854ec09
Diffstat (limited to 'tests')
-rw-r--r-- | tests/auto/qquickmenu/tst_qquickmenu.cpp | 40 | ||||
-rw-r--r-- | tests/auto/qquickmenubar/tst_qquickmenubar.cpp | 6 |
2 files changed, 23 insertions, 23 deletions
diff --git a/tests/auto/qquickmenu/tst_qquickmenu.cpp b/tests/auto/qquickmenu/tst_qquickmenu.cpp index f22ac972..2fe47477 100644 --- a/tests/auto/qquickmenu/tst_qquickmenu.cpp +++ b/tests/auto/qquickmenu/tst_qquickmenu.cpp @@ -151,10 +151,10 @@ void tst_QQuickMenu::mouse() QQuickApplicationHelper helper(this, QLatin1String("applicationwindow.qml")); QQuickApplicationWindow *window = helper.appWindow; - window->show(); - QVERIFY(QTest::qWaitForWindowActive(window)); centerOnScreen(window); moveMouseAway(window); + window->show(); + QVERIFY(QTest::qWaitForWindowActive(window)); QQuickMenu *menu = window->property("menu").value<QQuickMenu*>(); menu->open(); @@ -270,12 +270,12 @@ void tst_QQuickMenu::contextMenuKeyboard() QQuickApplicationHelper helper(this, QLatin1String("applicationwindow.qml")); QQuickApplicationWindow *window = helper.appWindow; + centerOnScreen(window); + moveMouseAway(window); window->show(); window->requestActivate(); QVERIFY(QTest::qWaitForWindowActive(window)); QVERIFY(QGuiApplication::focusWindow() == window); - centerOnScreen(window); - moveMouseAway(window); QQuickMenu *menu = window->property("menu").value<QQuickMenu*>(); QCOMPARE(menu->currentIndex(), -1); @@ -453,12 +453,12 @@ void tst_QQuickMenu::disabledMenuItemKeyNavigation() QQuickApplicationHelper helper(this, QLatin1String("disabledMenuItemKeyNavigation.qml")); QQuickApplicationWindow *window = helper.appWindow; + centerOnScreen(window); + moveMouseAway(window); window->show(); window->requestActivate(); QVERIFY(QTest::qWaitForWindowActive(window)); QVERIFY(QGuiApplication::focusWindow() == window); - centerOnScreen(window); - moveMouseAway(window); QQuickMenu *menu = window->property("menu").value<QQuickMenu*>(); QCOMPARE(menu->currentIndex(), -1); @@ -610,10 +610,10 @@ void tst_QQuickMenu::menuSeparator() { QQuickApplicationHelper helper(this, QLatin1String("menuSeparator.qml")); QQuickWindow *window = helper.window; - window->show(); - QVERIFY(QTest::qWaitForWindowActive(window)); centerOnScreen(window); moveMouseAway(window); + window->show(); + QVERIFY(QTest::qWaitForWindowActive(window)); QQuickMenu *menu = window->property("menu").value<QQuickMenu*>(); QVERIFY(menu); @@ -752,10 +752,10 @@ void tst_QQuickMenu::popup() { QQuickApplicationHelper helper(this, QLatin1String("popup.qml")); QQuickApplicationWindow *window = helper.appWindow; - window->show(); - QVERIFY(QTest::qWaitForWindowActive(window)); centerOnScreen(window); moveMouseAway(window); + window->show(); + QVERIFY(QTest::qWaitForWindowActive(window)); QQuickMenu *menu = window->property("menu").value<QQuickMenu *>(); QVERIFY(menu); @@ -1039,10 +1039,10 @@ void tst_QQuickMenu::subMenuMouse() QQuickApplicationHelper helper(this, QLatin1String("subMenus.qml")); QQuickApplicationWindow *window = helper.appWindow; - window->show(); - QVERIFY(QTest::qWaitForWindowActive(window)); centerOnScreen(window); moveMouseAway(window); + window->show(); + QVERIFY(QTest::qWaitForWindowActive(window)); QQuickMenu *mainMenu = window->property("mainMenu").value<QQuickMenu *>(); QVERIFY(mainMenu); @@ -1145,10 +1145,10 @@ void tst_QQuickMenu::subMenuDisabledMouse() QQuickApplicationHelper helper(this, QLatin1String("subMenuDisabled.qml")); QQuickApplicationWindow *window = helper.appWindow; - window->show(); - QVERIFY(QTest::qWaitForWindowActive(window)); centerOnScreen(window); moveMouseAway(window); + window->show(); + QVERIFY(QTest::qWaitForWindowActive(window)); QQuickMenu *mainMenu = window->property("mainMenu").value<QQuickMenu *>(); QVERIFY(mainMenu); @@ -1207,10 +1207,10 @@ void tst_QQuickMenu::subMenuKeyboard() QQuickApplicationHelper helper(this, QLatin1String("subMenus.qml")); QQuickApplicationWindow *window = helper.appWindow; - window->show(); - QVERIFY(QTest::qWaitForWindowActive(window)); centerOnScreen(window); moveMouseAway(window); + window->show(); + QVERIFY(QTest::qWaitForWindowActive(window)); if (mirrored) window->setLocale(QLocale("ar_EG")); @@ -1329,10 +1329,10 @@ void tst_QQuickMenu::subMenuDisabledKeyboard() QQuickApplicationHelper helper(this, QLatin1String("subMenuDisabled.qml")); QQuickApplicationWindow *window = helper.appWindow; - window->show(); - QVERIFY(QTest::qWaitForWindowActive(window)); centerOnScreen(window); moveMouseAway(window); + window->show(); + QVERIFY(QTest::qWaitForWindowActive(window)); if (mirrored) window->setLocale(QLocale("ar_EG")); @@ -1417,10 +1417,10 @@ void tst_QQuickMenu::subMenuPosition() if (flip) window->setWidth(window->width() - mainMenu->width()); - window->show(); - QVERIFY(QTest::qWaitForWindowActive(window)); centerOnScreen(window); moveMouseAway(window); + window->show(); + QVERIFY(QTest::qWaitForWindowActive(window)); if (mirrored) window->setLocale(QLocale("ar_EG")); diff --git a/tests/auto/qquickmenubar/tst_qquickmenubar.cpp b/tests/auto/qquickmenubar/tst_qquickmenubar.cpp index 19d67eac..9a22d26f 100644 --- a/tests/auto/qquickmenubar/tst_qquickmenubar.cpp +++ b/tests/auto/qquickmenubar/tst_qquickmenubar.cpp @@ -85,10 +85,10 @@ void tst_qquickmenubar::mouse() QScopedPointer<QQuickApplicationWindow> window(qobject_cast<QQuickApplicationWindow *>(engine.rootObjects().value(0))); QVERIFY(window); - QVERIFY(QTest::qWaitForWindowActive(window.data())); centerOnScreen(window.data()); moveMouseAway(window.data()); + QVERIFY(QTest::qWaitForWindowActive(window.data())); QQuickMenuBar *menuBar = window->property("header").value<QQuickMenuBar *>(); QVERIFY(menuBar); @@ -224,10 +224,10 @@ void tst_qquickmenubar::keys() QScopedPointer<QQuickApplicationWindow> window(qobject_cast<QQuickApplicationWindow *>(engine.rootObjects().value(0))); QVERIFY(window); - QVERIFY(QTest::qWaitForWindowActive(window.data())); centerOnScreen(window.data()); moveMouseAway(window.data()); + QVERIFY(QTest::qWaitForWindowActive(window.data())); QQuickMenuBar *menuBar = window->property("header").value<QQuickMenuBar *>(); QVERIFY(menuBar); @@ -412,10 +412,10 @@ void tst_qquickmenubar::mnemonics() QScopedPointer<QQuickApplicationWindow> window(qobject_cast<QQuickApplicationWindow *>(engine.rootObjects().value(0))); QVERIFY(window); - QVERIFY(QTest::qWaitForWindowActive(window.data())); centerOnScreen(window.data()); moveMouseAway(window.data()); + QVERIFY(QTest::qWaitForWindowActive(window.data())); QQuickMenuBar *menuBar = window->property("header").value<QQuickMenuBar *>(); QVERIFY(menuBar); |