summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorJason McDonald <jason.mcdonald@nokia.com>2011-10-06 10:57:07 +1000
committerQt by Nokia <qt-info@nokia.com>2011-10-06 07:36:54 +0200
commitedd377245adfecae307b587d937b9873187f5ce7 (patch)
treee1c25e5a1bd6aacc0c85c233e6ce680a98da890f /tests
parent18488067be8748b849477a8b75b5fffe055474db (diff)
Fix unreachable QSKIP in QMenu autotest
The QSKIP is only reachable on Mac, so only compile it for Mac. Change-Id: I268e87829e01755051f81cdaf856d936b04b3d49 Reviewed-on: http://codereview.qt-project.org/6091 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Diffstat (limited to 'tests')
-rw-r--r--tests/auto/qmenu/tst_qmenu.cpp7
1 files changed, 2 insertions, 5 deletions
diff --git a/tests/auto/qmenu/tst_qmenu.cpp b/tests/auto/qmenu/tst_qmenu.cpp
index b20fb1645b..001d863d82 100644
--- a/tests/auto/qmenu/tst_qmenu.cpp
+++ b/tests/auto/qmenu/tst_qmenu.cpp
@@ -380,15 +380,12 @@ void tst_QMenu::focus()
menu.addAction("One");
menu.addAction("Two");
menu.addAction("Three");
- bool fullKeyboardControl = true;
#ifdef Q_WS_MAC
- fullKeyboardControl = qt_tab_all_widgets;
-#endif
-
- if (!fullKeyboardControl)
+ if (!qt_tab_all_widgets)
QSKIP("Computer is currently set up to NOT tab to all widgets,"
" this test assumes you can tab to all widgets", SkipAll);
+#endif
QWidget window;
QPushButton button("Push me", &window);