diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-04-26 09:55:10 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-04-26 09:55:10 +0200 |
| commit | 866b47916dfcf2823b8fc4df719f1ebf15acef70 (patch) | |
| tree | a4eef09d00d407dec26b99b9f094bf1f5093dcb8 /tests/auto/widgets/widgets/qmenu/tst_qmenu.cpp | |
| parent | a9fc91466c2c143bea422d98af24755f43c2b97b (diff) | |
| parent | 4bab1b0d7c2462ee9c5369c949b45bc4dedc1194 (diff) | |
Merge remote-tracking branch 'origin/5.11' into dev
Conflicts:
src/plugins/platforms/cocoa/qcocoafontdialoghelper.mm
src/plugins/platforms/cocoa/qcocoawindow.mm
Change-Id: Ideea96d1b43d47b1d9b34e11c9986a88e240aa71
Diffstat (limited to 'tests/auto/widgets/widgets/qmenu/tst_qmenu.cpp')
| -rw-r--r-- | tests/auto/widgets/widgets/qmenu/tst_qmenu.cpp | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/tests/auto/widgets/widgets/qmenu/tst_qmenu.cpp b/tests/auto/widgets/widgets/qmenu/tst_qmenu.cpp index 9e0db6fb3f..4a7d653064 100644 --- a/tests/auto/widgets/widgets/qmenu/tst_qmenu.cpp +++ b/tests/auto/widgets/widgets/qmenu/tst_qmenu.cpp @@ -988,18 +988,14 @@ void tst_QMenu::task258920_mouseBorder() const QPoint center = QApplication::desktop()->availableGeometry().center(); menu.popup(center); QVERIFY(QTest::qWaitForWindowExposed(&menu)); - QTest::qWait(100); QRect actionRect = menu.actionGeometry(action); const QPoint actionCenter = actionRect.center(); QTest::mouseMove(&menu, actionCenter - QPoint(-10, 0)); - QTest::qWait(30); QTest::mouseMove(&menu, actionCenter); - QTest::qWait(30); QTest::mouseMove(&menu, actionCenter + QPoint(10, 0)); QTRY_COMPARE(action, menu.activeAction()); menu.painted = false; QTest::mouseMove(&menu, QPoint(actionRect.center().x(), actionRect.bottom() + 1)); - QTest::qWait(30); QTRY_COMPARE(static_cast<QAction*>(0), menu.activeAction()); QTRY_VERIFY(menu.painted); } @@ -1106,7 +1102,6 @@ void tst_QMenu::QTBUG7907_submenus_autoselect() menu.show(); QVERIFY(QTest::qWaitForWindowExposed(&menu)); QTest::mouseClick(&menu, Qt::LeftButton, Qt::NoModifier, QPoint(5,5) ); - QTest::qWait(500); QVERIFY(!subset.isVisible()); } @@ -1401,7 +1396,6 @@ void tst_QMenu::QTBUG_56917_wideMenuSize() menu.addAction(longString); QSize menuSizeHint = menu.sizeHint(); menu.popup(QPoint()); - QTest::qWait(100); QVERIFY(QTest::qWaitForWindowExposed(&menu)); QVERIFY(menu.isVisible()); QVERIFY(menu.height() <= menuSizeHint.height()); @@ -1419,7 +1413,6 @@ void tst_QMenu::QTBUG_56917_wideMenuScreenNumber() QMenu menu; menu.addAction(longString); menu.popup(QApplication::desktop()->screen(i)->geometry().center()); - QTest::qWait(100); QVERIFY(QTest::qWaitForWindowExposed(&menu)); QVERIFY(menu.isVisible()); QCOMPARE(QApplication::desktop()->screenNumber(&menu), i); |