1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tst_QMenu: Skip tests when window activation is not supported

Browse Source 
Makes sure the tests are skipped on Wayland.

Task-number: QTBUG-62188
Change-Id: Ia50d6cc02fbbac0fb6b77a16eb6372c1adb422d8
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
This commit is contained in:
Johan Klokkhammer Helsing 2018-06-07 13:30:45 +02:00 committed by Johan Helsing
parent 4b5afc788f
commit 3be141d5bc
1 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -29,6 +29,7 @@
#include <QtTest/QtTest> #include <QtTest/QtTest>
#include <QtTest/private/qtesthelpers_p.h> #include <QtTest/private/qtesthelpers_p.h>
#include <qapplication.h> #include <qapplication.h>
#include <private/qguiapplication_p.h>
#include <QPushButton> #include <QPushButton>
#include <QMainWindow> #include <QMainWindow>
#include <QMenuBar> #include <QMenuBar>
@ -48,6 +49,7 @@
#include <qdebug.h> #include <qdebug.h>
#include <qpa/qplatformtheme.h> #include <qpa/qplatformtheme.h>
#include <qpa/qplatformintegration.h>
using namespace QTestPrivate; using namespace QTestPrivate;
@ -459,6 +461,9 @@ void tst_QMenu::focus()
void tst_QMenu::overrideMenuAction() void tst_QMenu::overrideMenuAction()
{ {
if (!QGuiApplicationPrivate::platformIntegration()->hasCapability(QPlatformIntegration::WindowActivation))
QSKIP("Window activation is not supported");
//test the override menu action by first creating an action to which we set its menu //test the override menu action by first creating an action to which we set its menu
QMainWindow w; QMainWindow w;
w.resize(300, 200); w.resize(300, 200);
@ -614,6 +619,9 @@ static QMenu *getTornOffMenu()
void tst_QMenu::tearOff() void tst_QMenu::tearOff()
{ {
if (!QGuiApplicationPrivate::platformIntegration()->hasCapability(QPlatformIntegration::WindowActivation))
QSKIP("Window activation is not supported");
QWidget widget; QWidget widget;
QScopedPointer<QMenu> menu(new QMenu(&widget)); QScopedPointer<QMenu> menu(new QMenu(&widget));
QVERIFY(!menu->isTearOffEnabled()); //default value QVERIFY(!menu->isTearOffEnabled()); //default value
@ -686,6 +694,9 @@ void tst_QMenu::tearOff()
void tst_QMenu::submenuTearOffDontClose() void tst_QMenu::submenuTearOffDontClose()
{ {
if (!QGuiApplicationPrivate::platformIntegration()->hasCapability(QPlatformIntegration::WindowActivation))
QSKIP("Window activation is not supported");
QWidget widget; QWidget widget;
QMenu *menu = new QMenu(&widget); QMenu *menu = new QMenu(&widget);
QVERIFY(!menu->isTearOffEnabled()); //default value QVERIFY(!menu->isTearOffEnabled()); //default value
@ -1236,6 +1247,8 @@ public:
void tst_QMenu::QTBUG47515_widgetActionEnterLeave() void tst_QMenu::QTBUG47515_widgetActionEnterLeave()
{ {
if (!QGuiApplicationPrivate::platformIntegration()->hasCapability(QPlatformIntegration::WindowActivation))
QSKIP("Window activation is not supported");
if (QGuiApplication::platformName() == QLatin1String("cocoa")) if (QGuiApplication::platformName() == QLatin1String("cocoa"))
QSKIP("See QTBUG-63031"); QSKIP("See QTBUG-63031");
@ -1634,6 +1647,8 @@ void tst_QMenu::menuSize_Scrolling()
void tst_QMenu::tearOffMenuNotDisplayed() void tst_QMenu::tearOffMenuNotDisplayed()
{ {
if (!QGuiApplicationPrivate::platformIntegration()->hasCapability(QPlatformIntegration::WindowActivation))
QSKIP("Window activation is not supported");
QWidget widget; QWidget widget;
QScopedPointer<QMenu> menu(new QMenu(&widget)); QScopedPointer<QMenu> menu(new QMenu(&widget));
menu->setTearOffEnabled(true); menu->setTearOffEnabled(true);
@ -1669,6 +1684,9 @@ void tst_QMenu::tearOffMenuNotDisplayed()
void tst_QMenu::QTBUG_61039_menu_shortcuts() void tst_QMenu::QTBUG_61039_menu_shortcuts()
{ {
if (!QGuiApplicationPrivate::platformIntegration()->hasCapability(QPlatformIntegration::WindowActivation))
QSKIP("Window activation is not supported");
QAction *actionKamen = new QAction("Action Kamen"); QAction *actionKamen = new QAction("Action Kamen");
actionKamen->setShortcut(QKeySequence(QLatin1String("K"))); actionKamen->setShortcut(QKeySequence(QLatin1String("K")));