AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tst_QMenu: remove QSKIP's -> wrap Q_OS_WINCE

Browse Source 
Change-Id: If8cb4a7dc0630aca83e4796bffb46f547abc4b6f
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
This commit is contained in:
J-P Nurmi 2012-09-27 16:00:46 +02:00 committed by The Qt Project
parent 70bef120b7
commit 41dc50edff
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
tests/auto/widgets/widgets/qmenu/tst_qmenu.cpp
View File

@ -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()
{