diff options
| author | J-P Nurmi <jpnurmi@digia.com> | 2012-09-27 16:00:46 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-09-27 21:13:52 +0200 |
| commit | 41dc50edff73116f906c9eefea853921d8588805 (patch) | |
| tree | 63f19eb86d8d3378961243eff5645184b7759f0e /tests | |
| parent | 70bef120b7446983ee659ab3393e3aad871d48b9 (diff) | |
tst_QMenu: remove QSKIP's -> wrap Q_OS_WINCE
Change-Id: If8cb4a7dc0630aca83e4796bffb46f547abc4b6f
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/widgets/widgets/qmenu/tst_qmenu.cpp | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/tests/auto/widgets/widgets/qmenu/tst_qmenu.cpp b/tests/auto/widgets/widgets/qmenu/tst_qmenu.cpp index cd1b1aee42..01d42a38d5 100644 --- a/tests/auto/widgets/widgets/qmenu/tst_qmenu.cpp +++ b/tests/auto/widgets/widgets/qmenu/tst_qmenu.cpp @@ -80,7 +80,9 @@ private slots: void overrideMenuAction(); void statusTip(); void widgetActionFocus(); +#ifndef Q_OS_WINCE void mouseActivation(); +#endif void tearOff(); void layoutDirection(); @@ -91,7 +93,9 @@ private slots: void task250673_activeMultiColumnSubMenuPosition(); void task256918_setFont(); void menuSizeHint(); +#ifndef Q_OS_WINCE void task258920_mouseBorder(); +#endif void setFixedWidth(); void deleteActionInTriggered(); void pushButtonPopulateOnAboutToShow(); @@ -264,11 +268,10 @@ void tst_QMenu::addActionsAndClear() QCOMPARE(menus[0]->actions().count(), 0); } +// We have a separate mouseActivation test for Windows mobile +#ifndef Q_OS_WINCE void tst_QMenu::mouseActivation() { -#ifdef Q_OS_WINCE_WM - QSKIP("We have a separate mouseActivation test for Windows mobile."); -#endif QWidget topLevel; QMenu menu(&topLevel); topLevel.show(); @@ -301,6 +304,7 @@ void tst_QMenu::mouseActivation() QVERIFY(submenu.isVisible()); #endif } +#endif void tst_QMenu::keyboardNavigation_data() { @@ -773,11 +777,10 @@ public: bool painted; }; +// Mouse move related signals for Windows Mobile unavailable +#ifndef Q_OS_WINCE void tst_QMenu::task258920_mouseBorder() { -#ifdef Q_OS_WINCE_WM - QSKIP("Mouse move related signals for Windows Mobile unavailable"); -#endif Menu258920 menu; // For styles which inherit from QWindowsStyle, styleHint(QStyle::SH_Menu_MouseTracking) is true. menu.setMouseTracking(true); @@ -798,6 +801,7 @@ void tst_QMenu::task258920_mouseBorder() QTRY_COMPARE(static_cast<QAction*>(0), menu.activeAction()); QTRY_VERIFY(menu.painted); } +#endif void tst_QMenu::setFixedWidth() { |