Ignore tst_QMenu::keyboardNavigaction() failure on Mac OS X
The shortcut0 test data fails, indicating that keyboard navigation via shortcuts doesn't work on Mac OS X for the time being. Mark the failure as expected. Task-number: QTBUG-23684 Change-Id: I199222a87c09e6f491e5dcd21c9f65c28ecbb86d Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
This commit is contained in:
parent
2f46ea9fd6
commit
1d0d44a53a
@ -352,8 +352,13 @@ void tst_QMenu::keyboardNavigation()
|
||||
|
||||
QTest::keyClick(lastMenu, key, modifiers);
|
||||
if (expected_activated) {
|
||||
#ifdef Q_OS_MAC
|
||||
QEXPECT_FAIL("shortcut0", "Shortcut navication fails, see QTBUG-23684", Continue);
|
||||
#endif
|
||||
QCOMPARE(activated, builtins[expected_action]);
|
||||
#ifndef Q_OS_MAC
|
||||
QEXPECT_FAIL("shortcut0", "QTBUG-22449: QMenu doesn't remove highlight if a menu item is activated by a shortcut", Abort);
|
||||
#endif
|
||||
QCOMPARE(menus[expected_menu]->activeAction(), (QAction *)0);
|
||||
} else {
|
||||
QCOMPARE(menus[expected_menu]->activeAction(), builtins[expected_action]);
|
||||
@ -557,7 +562,9 @@ void tst_QMenu::tearOff()
|
||||
QTest::mouseClick(menu, Qt::LeftButton, 0, QPoint(3, 3), 10);
|
||||
QTest::qWait(100);
|
||||
|
||||
#ifndef Q_OS_MAC
|
||||
QEXPECT_FAIL("", "QTBUG-22565", Abort);
|
||||
#endif
|
||||
QVERIFY(menu->isTearOffMenuVisible());
|
||||
QPointer<QMenu> torn = 0;
|
||||
foreach (QWidget *w, QApplication::allWidgets()) {
|
||||
|
Loading…
Reference in New Issue
Block a user