summaryrefslogtreecommitdiffstats
path: root/tests/auto/widgets/widgets/qtoolbar/tst_qtoolbar.cpp
diff options
context:
space:
mode:
authorJohan Klokkhammer Helsing <johan.helsing@qt.io>2019-10-11 15:21:54 +0200
committerJohan Klokkhammer Helsing <johan.helsing@qt.io>2019-10-18 10:53:34 +0200
commit52484cc4b6696c8a5c1f69125d81eb0cede8cdb2 (patch)
tree4d5b0d4135104a7a623325fb761b615760630b98 /tests/auto/widgets/widgets/qtoolbar/tst_qtoolbar.cpp
parentdce8849037ee079d6b09dd4022aa80aa670caccd (diff)
Widget tests: Skip tests that fail on Wayland
Either by testing for platform name or window activation. After this gets in, we can enable widget tests in the Wayland bot, which hopefully will reduce the number of regressions in the Wayland plugin. Fixes: QTBUG-62188 Change-Id: I71ce8abd6b5891e5b953126b1c35345892585931 Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
Diffstat (limited to 'tests/auto/widgets/widgets/qtoolbar/tst_qtoolbar.cpp')
-rw-r--r--tests/auto/widgets/widgets/qtoolbar/tst_qtoolbar.cpp9
1 files changed, 9 insertions, 0 deletions
diff --git a/tests/auto/widgets/widgets/qtoolbar/tst_qtoolbar.cpp b/tests/auto/widgets/widgets/qtoolbar/tst_qtoolbar.cpp
index d6c165642e..4afb1c9751 100644
--- a/tests/auto/widgets/widgets/qtoolbar/tst_qtoolbar.cpp
+++ b/tests/auto/widgets/widgets/qtoolbar/tst_qtoolbar.cpp
@@ -1029,6 +1029,9 @@ QT_END_NAMESPACE
void tst_QToolBar::accel()
{
+ if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+ QSKIP("Wayland: This fails. Figure out why.");
+
#ifdef Q_OS_MAC
qt_set_sequence_auto_mnemonic(true);
#endif
@@ -1071,6 +1074,9 @@ void tst_QToolBar::task191727_layout()
void tst_QToolBar::task197996_visibility()
{
+ if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+ QSKIP("Wayland: This fails. Figure out why.");
+
QMainWindow mw;
QToolBar *toolBar = new QToolBar(&mw);
@@ -1129,6 +1135,9 @@ private:
void tst_QToolBar::extraCpuConsumption()
{
+ if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+ QSKIP("Wayland: This fails. Figure out why.");
+
QMainWindow mainWindow;
auto tb = new QToolBar(&mainWindow);