diff options
Diffstat (limited to 'tests/auto/widgets/widgets/qmenu/tst_qmenu.cpp')
-rw-r--r-- | tests/auto/widgets/widgets/qmenu/tst_qmenu.cpp | 27 |
1 files changed, 0 insertions, 27 deletions
diff --git a/tests/auto/widgets/widgets/qmenu/tst_qmenu.cpp b/tests/auto/widgets/widgets/qmenu/tst_qmenu.cpp index 9ee239aceb..8ce0ea2184 100644 --- a/tests/auto/widgets/widgets/qmenu/tst_qmenu.cpp +++ b/tests/auto/widgets/widgets/qmenu/tst_qmenu.cpp @@ -859,9 +859,6 @@ private: void tst_QMenu::activeSubMenuPositionExec() { -#ifdef Q_OS_WINRT - QSKIP("Broken on WinRT - QTBUG-68297"); -#endif SubMenuPositionExecMenu menu; menu.exec(QGuiApplication::primaryScreen()->availableGeometry().center()); } @@ -1099,9 +1096,6 @@ void tst_QMenu::pushButtonPopulateOnAboutToShow() QTimer::singleShot(300, buttonMenu, SLOT(hide())); QTest::mouseClick(&b, Qt::LeftButton, Qt::NoModifier, b.rect().center()); -#ifdef Q_OS_WINRT - QEXPECT_FAIL("", "WinRT does not support QTest::mouseClick", Abort); -#endif QVERIFY2(!buttonMenu->geometry().intersects(b.geometry()), msgGeometryIntersects(buttonMenu->geometry(), b.geometry())); // note: we're assuming that, if we previously got the desired geometry, we'll get it here too @@ -1211,9 +1205,6 @@ void tst_QMenu::click_while_dismissing_submenu() //this opens the submenu, move two times to emulate user interaction (d->motions > 0 in QMenu) QTest::mouseMove(menuWindow, menu.rect().center() + QPoint(0,2)); QTest::mouseMove(menuWindow, menu.rect().center() + QPoint(1,3), 60); -#ifdef Q_OS_WINRT - QEXPECT_FAIL("", "WinRT does not support QTest::mouseMove", Abort); -#endif QVERIFY(menuShownSpy.wait()); QVERIFY(sub.isVisible()); QVERIFY(QTest::qWaitForWindowExposed(&sub)); @@ -1312,9 +1303,6 @@ void tst_QMenu::QTBUG47515_widgetActionEnterLeave() QTest::mouseMove(topLevelWindow, w1Center); QVERIFY(w1->isVisible()); QTRY_COMPARE(w1->leave, 0); -#ifdef Q_OS_WINRT - QEXPECT_FAIL("", "WinRT does not support QTest::mouseMove", Abort); -#endif QTRY_COMPARE(w1->enter, 1); // Check whether leave event is not delivered on mouse move @@ -1360,9 +1348,6 @@ void tst_QMenu::QTBUG8122_widgetActionCrashOnClose() QSKIP("Window activation is not supported"); if (QGuiApplication::platformName() == QLatin1String("cocoa")) QSKIP("See QTBUG-63031"); -#ifdef Q_OS_WINRT - QSKIP("WinRT does not support QTest::mouseMove"); -#endif const QRect availableGeometry = QGuiApplication::primaryScreen()->availableGeometry(); QRect geometry(QPoint(), availableGeometry.size() / 3); @@ -1572,9 +1557,6 @@ void tst_QMenu::QTBUG_56917_wideMenuSize() menu.popup(QPoint()); QVERIFY(QTest::qWaitForWindowExposed(&menu)); QVERIFY(menu.isVisible()); -#ifdef Q_OS_WINRT - QEXPECT_FAIL("", "Broken on WinRT - QTBUG-68297", Abort); -#endif QVERIFY(menu.height() <= menuSizeHint.height()); } @@ -1711,9 +1693,6 @@ void tst_QMenu::menuSize_Scrolling() const QMargins cm = contentsMargins(); QRect lastItem = actionGeometry(actions().at(actions().length() - 1)); QSize s = size(); -#ifdef Q_OS_WINRT - QEXPECT_FAIL("", "Broken on WinRT - QTBUG-68297", Abort); -#endif if (!QGuiApplication::platformName().compare(QLatin1String("minimal"), Qt::CaseInsensitive) || !QGuiApplication::platformName().compare(QLatin1String("offscreen"), Qt::CaseInsensitive)) { QWARN("Skipping test on minimal/offscreen platforms - QTBUG-73522"); @@ -1789,12 +1768,6 @@ void tst_QMenu::menuSize_Scrolling() return; QTest::keyClick(&menu, Qt::Key_End); -#ifdef Q_OS_WINRT - QEXPECT_FAIL("data8", "Broken on WinRT - QTBUG-68297", Abort); - QEXPECT_FAIL("data9", "Broken on WinRT - QTBUG-68297", Abort); - QEXPECT_FAIL("data10", "Broken on WinRT - QTBUG-68297", Abort); - QEXPECT_FAIL("data11", "Broken on WinRT - QTBUG-68297", Abort); -#endif QTRY_COMPARE(menu.actionGeometry(actions.last()).right(), menu.width() - mm.fw - mm.hmargin - leftMargin - 1); QCOMPARE(menu.actionGeometry(actions.last()).bottom(), |