From 45b0f1be686cfba8dcecb9be5c875cae59c69276 Mon Sep 17 00:00:00 2001 From: Oliver Wolff Date: Fri, 5 Jun 2020 09:24:37 +0200 Subject: Remove winrt MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Macros and the await helper function from qfunctions_winrt(_p).h are needed in other Qt modules which use UWP APIs on desktop windows. Task-number: QTBUG-84434 Change-Id: Ice09c11436ad151c17bdccd2c7defadd08c13925 Reviewed-by: Tor Arne Vestbø --- tests/auto/widgets/widgets/qmenubar/tst_qmenubar.cpp | 6 ------ 1 file changed, 6 deletions(-) (limited to 'tests/auto/widgets/widgets/qmenubar/tst_qmenubar.cpp') diff --git a/tests/auto/widgets/widgets/qmenubar/tst_qmenubar.cpp b/tests/auto/widgets/widgets/qmenubar/tst_qmenubar.cpp index 1638ac846f..39ab5f6ebf 100644 --- a/tests/auto/widgets/widgets/qmenubar/tst_qmenubar.cpp +++ b/tests/auto/widgets/widgets/qmenubar/tst_qmenubar.cpp @@ -1226,9 +1226,6 @@ void tst_QMenuBar::check_menuPosition() mbItemRect.moveTo(w.menuBar()->mapToGlobal(mbItemRect.topLeft())); QTest::keyClick(&w, Qt::Key_M, Qt::AltModifier ); QVERIFY(menu.isActiveWindow()); -#ifdef Q_OS_WINRT - QEXPECT_FAIL("", "QTest::keyClick does not work on WinRT.", Abort); -#endif QCOMPARE(menu.pos(), QPoint(mbItemRect.x(), mbItemRect.top() - menu.height())); menu.close(); } @@ -1565,9 +1562,6 @@ void tst_QMenuBar::cornerWidgets() case Qt::TopLeftCorner: QVERIFY2(fileMenuGeometry.left() >= cornerWidgetWidth, msgComparison(fileMenuGeometry.left(), ">=", cornerWidgetWidth)); -#ifdef Q_OS_WINRT - QEXPECT_FAIL("", "Broken on WinRT - QTBUG-68297", Abort); -#endif QVERIFY2(menuBarWidth - editMenuGeometry.right() < cornerWidgetWidth, msgComparison(menuBarWidth - editMenuGeometry.right(), "<", cornerWidgetWidth)); break; -- cgit v1.2.3