summaryrefslogtreecommitdiffstats
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
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>
-rw-r--r--tests/auto/widgets/dialogs/qfiledialog/tst_qfiledialog.cpp9
-rw-r--r--tests/auto/widgets/dialogs/qfontdialog/tst_qfontdialog.cpp3
-rw-r--r--tests/auto/widgets/graphicsview/qgraphicspixmapitem/tst_qgraphicspixmapitem.cpp3
-rw-r--r--tests/auto/widgets/graphicsview/qgraphicsscene/tst_qgraphicsscene.cpp15
-rw-r--r--tests/auto/widgets/graphicsview/qgraphicsview/tst_qgraphicsview.cpp17
-rw-r--r--tests/auto/widgets/itemviews/qabstractitemview/qabstractitemview.pro2
-rw-r--r--tests/auto/widgets/itemviews/qabstractitemview/tst_qabstractitemview.cpp43
-rw-r--r--tests/auto/widgets/itemviews/qcolumnview/tst_qcolumnview.cpp6
-rw-r--r--tests/auto/widgets/itemviews/qdatawidgetmapper/tst_qdatawidgetmapper.cpp3
-rw-r--r--tests/auto/widgets/itemviews/qheaderview/tst_qheaderview.cpp9
-rw-r--r--tests/auto/widgets/itemviews/qitemdelegate/tst_qitemdelegate.cpp12
-rw-r--r--tests/auto/widgets/itemviews/qitemview/tst_qitemview.cpp3
-rw-r--r--tests/auto/widgets/itemviews/qlistview/tst_qlistview.cpp18
-rw-r--r--tests/auto/widgets/itemviews/qlistwidget/tst_qlistwidget.cpp9
-rw-r--r--tests/auto/widgets/itemviews/qtableview/tst_qtableview.cpp27
-rw-r--r--tests/auto/widgets/itemviews/qtreeview/tst_qtreeview.cpp39
-rw-r--r--tests/auto/widgets/itemviews/qtreewidget/tst_qtreewidget.cpp15
-rw-r--r--tests/auto/widgets/kernel/qaction/tst_qaction.cpp10
-rw-r--r--tests/auto/widgets/kernel/qapplication/tst_qapplication.cpp3
-rw-r--r--tests/auto/widgets/kernel/qshortcut/tst_qshortcut.cpp24
-rw-r--r--tests/auto/widgets/kernel/qstackedlayout/tst_qstackedlayout.cpp3
-rw-r--r--tests/auto/widgets/kernel/qtooltip/tst_qtooltip.cpp6
-rw-r--r--tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp51
-rw-r--r--tests/auto/widgets/kernel/qwidget_window/tst_qwidget_window.cpp18
-rw-r--r--tests/auto/widgets/kernel/qwindowcontainer/tst_qwindowcontainer.cpp15
-rw-r--r--tests/auto/widgets/styles/qstylesheetstyle/tst_qstylesheetstyle.cpp33
-rw-r--r--tests/auto/widgets/util/qcompleter/tst_qcompleter.cpp30
-rw-r--r--tests/auto/widgets/util/qsystemtrayicon/tst_qsystemtrayicon.cpp3
-rw-r--r--tests/auto/widgets/widgets/qabstractbutton/qabstractbutton.pro2
-rw-r--r--tests/auto/widgets/widgets/qabstractbutton/tst_qabstractbutton.cpp6
-rw-r--r--tests/auto/widgets/widgets/qabstractspinbox/tst_qabstractspinbox.cpp3
-rw-r--r--tests/auto/widgets/widgets/qbuttongroup/tst_qbuttongroup.cpp3
-rw-r--r--tests/auto/widgets/widgets/qcalendarwidget/tst_qcalendarwidget.cpp3
-rw-r--r--tests/auto/widgets/widgets/qcheckbox/tst_qcheckbox.cpp3
-rw-r--r--tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp27
-rw-r--r--tests/auto/widgets/widgets/qcommandlinkbutton/tst_qcommandlinkbutton.cpp2
-rw-r--r--tests/auto/widgets/widgets/qdatetimeedit/tst_qdatetimeedit.cpp9
-rw-r--r--tests/auto/widgets/widgets/qdialogbuttonbox/tst_qdialogbuttonbox.cpp3
-rw-r--r--tests/auto/widgets/widgets/qdockwidget/tst_qdockwidget.cpp3
-rw-r--r--tests/auto/widgets/widgets/qdoublespinbox/tst_qdoublespinbox.cpp4
-rw-r--r--tests/auto/widgets/widgets/qfontcombobox/tst_qfontcombobox.cpp8
-rw-r--r--tests/auto/widgets/widgets/qframe/tst_qframe.cpp3
-rw-r--r--tests/auto/widgets/widgets/qgroupbox/tst_qgroupbox.cpp3
-rw-r--r--tests/auto/widgets/widgets/qlineedit/tst_qlineedit.cpp66
-rw-r--r--tests/auto/widgets/widgets/qmainwindow/tst_qmainwindow.cpp9
-rw-r--r--tests/auto/widgets/widgets/qmdiarea/tst_qmdiarea.cpp15
-rw-r--r--tests/auto/widgets/widgets/qmdisubwindow/tst_qmdisubwindow.cpp3
-rw-r--r--tests/auto/widgets/widgets/qmenubar/tst_qmenubar.cpp51
-rw-r--r--tests/auto/widgets/widgets/qopenglwidget/tst_qopenglwidget.cpp6
-rw-r--r--tests/auto/widgets/widgets/qplaintextedit/tst_qplaintextedit.cpp13
-rw-r--r--tests/auto/widgets/widgets/qprogressbar/tst_qprogressbar.cpp3
-rw-r--r--tests/auto/widgets/widgets/qpushbutton/tst_qpushbutton.cpp3
-rw-r--r--tests/auto/widgets/widgets/qradiobutton/tst_qradiobutton.cpp3
-rw-r--r--tests/auto/widgets/widgets/qspinbox/tst_qspinbox.cpp24
-rw-r--r--tests/auto/widgets/widgets/qsplitter/tst_qsplitter.cpp12
-rw-r--r--tests/auto/widgets/widgets/qstackedwidget/tst_qstackedwidget.cpp3
-rw-r--r--tests/auto/widgets/widgets/qstatusbar/tst_qstatusbar.cpp6
-rw-r--r--tests/auto/widgets/widgets/qtabwidget/tst_qtabwidget.cpp3
-rw-r--r--tests/auto/widgets/widgets/qtextbrowser/tst_qtextbrowser.cpp7
-rw-r--r--tests/auto/widgets/widgets/qtextedit/tst_qtextedit.cpp22
-rw-r--r--tests/auto/widgets/widgets/qtoolbar/tst_qtoolbar.cpp9
-rw-r--r--tests/auto/widgets/widgets/qtoolbutton/tst_qtoolbutton.cpp6
62 files changed, 773 insertions, 2 deletions
diff --git a/tests/auto/widgets/dialogs/qfiledialog/tst_qfiledialog.cpp b/tests/auto/widgets/dialogs/qfiledialog/tst_qfiledialog.cpp
index 2131e45f29..029738652e 100644
--- a/tests/auto/widgets/dialogs/qfiledialog/tst_qfiledialog.cpp
+++ b/tests/auto/widgets/dialogs/qfiledialog/tst_qfiledialog.cpp
@@ -57,6 +57,7 @@
#endif
#include <private/qguiapplication_p.h>
#include <qpa/qplatformtheme.h>
+#include <qpa/qplatformintegration.h>
#include <QFileDialog>
#include <QFileSystemModel>
@@ -1129,6 +1130,8 @@ void tst_QFiledialog::setNameFilter()
void tst_QFiledialog::focus()
{
+ if (!QGuiApplicationPrivate::platformIntegration()->hasCapability(QPlatformIntegration::WindowActivation))
+ QSKIP("Window activation is not supported");
QFileDialog fd;
fd.setDirectory(QDir::currentPath());
fd.show();
@@ -1550,6 +1553,9 @@ public slots:
void tst_QFiledialog::rejectModalDialogs()
{
+ if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+ QSKIP("Wayland: This freezes. Figure out why.");
+
// QTBUG-38672 , static functions should return empty Urls
DialogRejecter dr;
@@ -1609,6 +1615,9 @@ public:
void tst_QFiledialog::focusObjectDuringDestruction()
{
+ if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+ QSKIP("Wayland: This freezes. Figure out why.");
+
QTRY_VERIFY(QGuiApplication::topLevelWindows().isEmpty());
qtbug57193DialogRejecter dialogRejecter;
diff --git a/tests/auto/widgets/dialogs/qfontdialog/tst_qfontdialog.cpp b/tests/auto/widgets/dialogs/qfontdialog/tst_qfontdialog.cpp
index a5aaf62855..83bb4dc08f 100644
--- a/tests/auto/widgets/dialogs/qfontdialog/tst_qfontdialog.cpp
+++ b/tests/auto/widgets/dialogs/qfontdialog/tst_qfontdialog.cpp
@@ -179,6 +179,9 @@ class FriendlyFontDialog : public QFontDialog
void tst_QFontDialog::task256466_wrongStyle()
{
+ if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+ QSKIP("Wayland: This freezes. Figure out why.");
+
QFontDatabase fdb;
FriendlyFontDialog dialog;
dialog.setOption(QFontDialog::DontUseNativeDialog);
diff --git a/tests/auto/widgets/graphicsview/qgraphicspixmapitem/tst_qgraphicspixmapitem.cpp b/tests/auto/widgets/graphicsview/qgraphicspixmapitem/tst_qgraphicspixmapitem.cpp
index 78fe448bdb..f7e7022059 100644
--- a/tests/auto/widgets/graphicsview/qgraphicspixmapitem/tst_qgraphicspixmapitem.cpp
+++ b/tests/auto/widgets/graphicsview/qgraphicspixmapitem/tst_qgraphicspixmapitem.cpp
@@ -152,6 +152,9 @@ void tst_QGraphicsPixmapItem::contains_data()
// public bool contains(QPointF const& point) const
void tst_QGraphicsPixmapItem::contains()
{
+ if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+ QSKIP("Wayland: This fails. Figure out why.");
+
QFETCH(QPixmap, pixmap);
QFETCH(QPointF, point);
QFETCH(bool, contains);
diff --git a/tests/auto/widgets/graphicsview/qgraphicsscene/tst_qgraphicsscene.cpp b/tests/auto/widgets/graphicsview/qgraphicsscene/tst_qgraphicsscene.cpp
index 950f3ef670..b49d2cd8b0 100644
--- a/tests/auto/widgets/graphicsview/qgraphicsscene/tst_qgraphicsscene.cpp
+++ b/tests/auto/widgets/graphicsview/qgraphicsscene/tst_qgraphicsscene.cpp
@@ -3078,6 +3078,9 @@ void tst_QGraphicsScene::tabFocus_emptyScene()
void tst_QGraphicsScene::tabFocus_sceneWithFocusableItems()
{
+ if (!QGuiApplicationPrivate::platformIntegration()->hasCapability(QPlatformIntegration::WindowActivation))
+ QSKIP("Window activation is not supported");
+
QGraphicsScene scene;
QGraphicsTextItem *item = scene.addText("Qt rocks!");
item->setTabChangesFocus(true);
@@ -3218,6 +3221,9 @@ protected:
void tst_QGraphicsScene::tabFocus_sceneWithFocusWidgets()
{
+ if (!QGuiApplicationPrivate::platformIntegration()->hasCapability(QPlatformIntegration::WindowActivation))
+ QSKIP("Window activation is not supported");
+
QGraphicsScene scene;
FocusWidget *widget1 = new FocusWidget;
@@ -3287,6 +3293,9 @@ void tst_QGraphicsScene::tabFocus_sceneWithFocusWidgets()
void tst_QGraphicsScene::tabFocus_sceneWithNestedFocusWidgets()
{
+ if (!QGuiApplicationPrivate::platformIntegration()->hasCapability(QPlatformIntegration::WindowActivation))
+ QSKIP("Window activation is not supported");
+
QGraphicsScene scene;
FocusWidget *widget1 = new FocusWidget;
@@ -3811,6 +3820,9 @@ public:
void tst_QGraphicsScene::inputMethod()
{
+ if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+ QSKIP("Wayland: This fails. Figure out why.");
+
PlatformInputContext inputContext;
QInputMethodPrivate *inputMethodPrivate =
QInputMethodPrivate::get(QGuiApplication::inputMethod());
@@ -4054,6 +4066,9 @@ void tst_QGraphicsScene::polishItems2()
void tst_QGraphicsScene::isActive()
{
+ if (!QGuiApplicationPrivate::platformIntegration()->hasCapability(QPlatformIntegration::WindowActivation))
+ QSKIP("Window activation is not supported");
+
#if defined(Q_OS_ANDROID) && !defined(Q_OS_ANDROID_EMBEDDED)
QSKIP("Fails on Android (QTBUG-44430)");
#endif
diff --git a/tests/auto/widgets/graphicsview/qgraphicsview/tst_qgraphicsview.cpp b/tests/auto/widgets/graphicsview/qgraphicsview/tst_qgraphicsview.cpp
index e21b1b889a..cf8066c7a3 100644
--- a/tests/auto/widgets/graphicsview/qgraphicsview/tst_qgraphicsview.cpp
+++ b/tests/auto/widgets/graphicsview/qgraphicsview/tst_qgraphicsview.cpp
@@ -418,6 +418,9 @@ void tst_QGraphicsView::alignment()
void tst_QGraphicsView::interactive()
{
+ if (!QGuiApplicationPrivate::platformIntegration()->hasCapability(QPlatformIntegration::WindowActivation))
+ QSKIP("Window activation is not supported");
+
TestItem *item = new TestItem;
item->setFlags(QGraphicsItem::ItemIsMovable);
QCOMPARE(item->events.size(), 0);
@@ -3297,6 +3300,9 @@ void tst_QGraphicsView::task186827_deleteReplayedItem()
void tst_QGraphicsView::task207546_focusCrash()
{
+ if (!QGuiApplicationPrivate::platformIntegration()->hasCapability(QPlatformIntegration::WindowActivation))
+ QSKIP("Window activation is not supported");
+
class _Widget : public QWidget
{
public:
@@ -3641,6 +3647,8 @@ void tst_QGraphicsView::moveItemWhileScrolling()
int a = adjustForAntialiasing ? 2 : 1;
expectedRegion += QRect(40, 50, 10, 10).adjusted(-a, -a, a, a);
expectedRegion += QRect(40, 60, 10, 10).adjusted(-a, -a, a, a);
+ if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+ QSKIP("Wayland: This fails. Figure out why.");
COMPARE_REGIONS(view.lastPaintedRegion, expectedRegion);
}
@@ -4394,6 +4402,9 @@ void tst_QGraphicsView::inputMethodSensitivity()
void tst_QGraphicsView::inputContextReset()
{
+ if (!QGuiApplicationPrivate::platformIntegration()->hasCapability(QPlatformIntegration::WindowActivation))
+ QSKIP("Window activation is not supported");
+
PlatformInputContext inputContext;
QInputMethodPrivate *inputMethodPrivate = QInputMethodPrivate::get(qApp->inputMethod());
inputMethodPrivate->testContext = &inputContext;
@@ -4652,6 +4663,9 @@ void tst_QGraphicsView::QTBUG_4151_clipAndIgnore_data()
void tst_QGraphicsView::QTBUG_4151_clipAndIgnore()
{
+ if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+ QSKIP("Wayland: This fails. Figure out why.");
+
QFETCH(bool, clip);
QFETCH(bool, ignoreTransformations);
QFETCH(int, numItems);
@@ -4834,6 +4848,9 @@ QRectF IMItem::mf(1.5, 1.6, 10, 10);
void tst_QGraphicsView::QTBUG_16063_microFocusRect()
{
+ if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+ QSKIP("Wayland: This fails. Figure out why.");
+
QGraphicsScene scene;
IMItem *item = new IMItem();
scene.addItem(item);
diff --git a/tests/auto/widgets/itemviews/qabstractitemview/qabstractitemview.pro b/tests/auto/widgets/itemviews/qabstractitemview/qabstractitemview.pro
index 4ee7f28af6..809a996324 100644
--- a/tests/auto/widgets/itemviews/qabstractitemview/qabstractitemview.pro
+++ b/tests/auto/widgets/itemviews/qabstractitemview/qabstractitemview.pro
@@ -1,4 +1,4 @@
CONFIG += testcase
TARGET = tst_qabstractitemview
-QT += widgets testlib testlib-private
+QT += widgets testlib testlib-private gui-private
SOURCES += tst_qabstractitemview.cpp
diff --git a/tests/auto/widgets/itemviews/qabstractitemview/tst_qabstractitemview.cpp b/tests/auto/widgets/itemviews/qabstractitemview/tst_qabstractitemview.cpp
index 3316c8ab93..0834d989e0 100644
--- a/tests/auto/widgets/itemviews/qabstractitemview/tst_qabstractitemview.cpp
+++ b/tests/auto/widgets/itemviews/qabstractitemview/tst_qabstractitemview.cpp
@@ -26,6 +26,10 @@
**
****************************************************************************/
+#include <private/qguiapplication_p.h>
+
+#include <qpa/qplatformintegration.h>
+
#include <QAbstractItemView>
#include <QDialog>
#include <QHeaderView>
@@ -975,6 +979,9 @@ void tst_QAbstractItemView::setItemDelegate_data()
void tst_QAbstractItemView::setItemDelegate()
{
+ if (!QGuiApplicationPrivate::platformIntegration()->hasCapability(QPlatformIntegration::WindowActivation))
+ QSKIP("Window activation is not supported");
+
QFETCH(const IntList, rowsOrColumnsWithDelegate);
QFETCH(QPoint, cellToEdit);
QTableView v;
@@ -1093,6 +1100,9 @@ void tst_QAbstractItemView::setCurrentIndex()
void tst_QAbstractItemView::task221955_selectedEditor()
{
+ if (!QGuiApplicationPrivate::platformIntegration()->hasCapability(QPlatformIntegration::WindowActivation))
+ QSKIP("Window activation is not supported");
+
QTreeWidget tree;
tree.setColumnCount(2);
@@ -1178,6 +1188,9 @@ void tst_QAbstractItemView::task250754_fontChange()
void tst_QAbstractItemView::task200665_itemEntered()
{
+ if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+ QSKIP("Wayland: This fails. Figure out why.");
+
//we test that view will emit entered
//when the scrollbar move but not the mouse itself
QStandardItemModel model(1000, 1);
@@ -1385,6 +1398,9 @@ void tst_QAbstractItemView::ctrlRubberbandSelection()
void tst_QAbstractItemView::QTBUG6407_extendedSelection()
{
+ if (!QGuiApplicationPrivate::platformIntegration()->hasCapability(QPlatformIntegration::WindowActivation))
+ QSKIP("Window activation is not supported");
+
QListWidget view;
view.setSelectionMode(QAbstractItemView::ExtendedSelection);
for (int i = 0; i < 50; ++i)
@@ -1466,6 +1482,9 @@ void tst_QAbstractItemView::testDelegateDestroyEditor()
void tst_QAbstractItemView::testClickedSignal()
{
+ if (!QGuiApplicationPrivate::platformIntegration()->hasCapability(QPlatformIntegration::WindowActivation))
+ QSKIP("Window activation is not supported");
+
QTableWidget view(5, 5);
centerOnScreen(&view);
@@ -1510,6 +1529,9 @@ public:
void tst_QAbstractItemView::testChangeEditorState()
{
+ if (!QGuiApplicationPrivate::platformIntegration()->hasCapability(QPlatformIntegration::WindowActivation))
+ QSKIP("Window activation is not supported");
+
// Test for QTBUG-25370
TestModel model;
model.setItem(0, 0, new QStandardItem("a"));
@@ -1577,6 +1599,9 @@ void tst_QAbstractItemView::deselectInSingleSelection()
void tst_QAbstractItemView::testNoActivateOnDisabledItem()
{
+ if (!QGuiApplicationPrivate::platformIntegration()->hasCapability(QPlatformIntegration::WindowActivation))
+ QSKIP("Window activation is not supported");
+
QTreeView treeView;
QStandardItemModel model(1, 1);
QStandardItem *item = new QStandardItem("item");
@@ -1613,6 +1638,9 @@ void tst_QAbstractItemView::testFocusPolicy_data()
void tst_QAbstractItemView::testFocusPolicy()
{
+ if (!QGuiApplicationPrivate::platformIntegration()->hasCapability(QPlatformIntegration::WindowActivation))
+ QSKIP("Window activation is not supported");
+
QFETCH(QAbstractItemDelegate*, delegate);
QWidget window;
@@ -1821,6 +1849,9 @@ void tst_QAbstractItemView::shiftSelectionAfterChangingModelContents()
void tst_QAbstractItemView::QTBUG48968_reentrant_updateEditorGeometries()
{
+ if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+ QSKIP("Wayland: This fails. Figure out why.");
+
QTreeView tree;
QStandardItemModel *m = new QStandardItemModel(&tree);
for (int i = 0; i < 10; ++i) {
@@ -2154,6 +2185,9 @@ public:
void tst_QAbstractItemView::QTBUG46785_mouseout_hover_state()
{
+ if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+ QSKIP("Wayland: This fails. Figure out why.");
+
HoverItemDelegate delegate;
QTableWidget table(5, 5);
@@ -2232,6 +2266,9 @@ void tst_QAbstractItemView::inputMethodEnabled_data()
void tst_QAbstractItemView::inputMethodEnabled()
{
+ if (!QGuiApplicationPrivate::platformIntegration()->hasCapability(QPlatformIntegration::WindowActivation))
+ QSKIP("Window activation is not supported");
+
QFETCH(QByteArray, viewType);
QFETCH(Qt::ItemFlags, itemFlags);
QFETCH(bool, result);
@@ -2312,6 +2349,9 @@ void tst_QAbstractItemView::currentFollowsIndexWidget_data()
void tst_QAbstractItemView::currentFollowsIndexWidget()
{
+ if (!QGuiApplicationPrivate::platformIntegration()->hasCapability(QPlatformIntegration::WindowActivation))
+ QSKIP("Window activation is not supported");
+
QFETCH(QByteArray, viewType);
QScopedPointer<QAbstractItemView> view(viewFromString(viewType));
@@ -2369,6 +2409,9 @@ void tst_QAbstractItemView::checkFocusAfterActivationChanges_data()
void tst_QAbstractItemView::checkFocusAfterActivationChanges()
{
+ if (!QGuiApplicationPrivate::platformIntegration()->hasCapability(QPlatformIntegration::WindowActivation))
+ QSKIP("Window activation is not supported");
+
QFETCH(QByteArray, viewType);
const QRect availableGeo = QGuiApplication::primaryScreen()->availableGeometry();
diff --git a/tests/auto/widgets/itemviews/qcolumnview/tst_qcolumnview.cpp b/tests/auto/widgets/itemviews/qcolumnview/tst_qcolumnview.cpp
index 8264d71e83..5ac144340d 100644
--- a/tests/auto/widgets/itemviews/qcolumnview/tst_qcolumnview.cpp
+++ b/tests/auto/widgets/itemviews/qcolumnview/tst_qcolumnview.cpp
@@ -346,6 +346,9 @@ void tst_QColumnView::scrollTo_data()
void tst_QColumnView::scrollTo()
{
+ if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+ QSKIP("Wayland: This fails. Figure out why.");
+
QFETCH(bool, reverse);
QFETCH(bool, giveFocus);
QWidget topLevel;
@@ -665,6 +668,9 @@ void tst_QColumnView::moveGrip_data()
void tst_QColumnView::moveGrip()
{
+ if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+ QSKIP("Wayland: This fails. Figure out why.");
+
QFETCH(bool, reverse);
QWidget topLevel;
if (reverse)
diff --git a/tests/auto/widgets/itemviews/qdatawidgetmapper/tst_qdatawidgetmapper.cpp b/tests/auto/widgets/itemviews/qdatawidgetmapper/tst_qdatawidgetmapper.cpp
index 5ab0a226b7..5717afab51 100644
--- a/tests/auto/widgets/itemviews/qdatawidgetmapper/tst_qdatawidgetmapper.cpp
+++ b/tests/auto/widgets/itemviews/qdatawidgetmapper/tst_qdatawidgetmapper.cpp
@@ -416,6 +416,9 @@ void tst_QDataWidgetMapper::mappedWidgetAt()
void tst_QDataWidgetMapper::textEditDoesntChangeFocusOnTab_qtbug3305()
{
+ if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+ QSKIP("Wayland: This fails. Figure out why.");
+
QDataWidgetMapper mapper;
QAbstractItemModel *model = testModel(&mapper);
mapper.setModel(model);
diff --git a/tests/auto/widgets/itemviews/qheaderview/tst_qheaderview.cpp b/tests/auto/widgets/itemviews/qheaderview/tst_qheaderview.cpp
index 64bf38d04b..d5813d64ff 100644
--- a/tests/auto/widgets/itemviews/qheaderview/tst_qheaderview.cpp
+++ b/tests/auto/widgets/itemviews/qheaderview/tst_qheaderview.cpp
@@ -1558,6 +1558,9 @@ void tst_QHeaderView::hiddenSectionCount()
void tst_QHeaderView::focusPolicy()
{
+ if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+ QSKIP("Wayland: This fails. Figure out why.");
+
QHeaderView view(Qt::Horizontal);
QCOMPARE(view.focusPolicy(), Qt::NoFocus);
@@ -2295,6 +2298,9 @@ static int checkHeaderViewOrder(const QHeaderView *view, const IntList &expected
void tst_QHeaderView::QTBUG6058_reset()
{
+ if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+ QSKIP("Wayland: This fails. Figure out why.");
+
QStringListModel model1({ "0", "1", "2", "3", "4", "5" });
QStringListModel model2({ "a", "b", "c" });
QSortFilterProxyModel proxy;
@@ -3441,6 +3447,9 @@ protected:
void tst_QHeaderView::statusTips()
{
+ if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+ QSKIP("Wayland: This fails. Figure out why.");
+
StatusTipHeaderView headerView(Qt::Horizontal);
QtTestModel model(5, 5);
headerView.setModel(&model);
diff --git a/tests/auto/widgets/itemviews/qitemdelegate/tst_qitemdelegate.cpp b/tests/auto/widgets/itemviews/qitemdelegate/tst_qitemdelegate.cpp
index dc246c0ebf..0243b587b2 100644
--- a/tests/auto/widgets/itemviews/qitemdelegate/tst_qitemdelegate.cpp
+++ b/tests/auto/widgets/itemviews/qitemdelegate/tst_qitemdelegate.cpp
@@ -1030,6 +1030,9 @@ void tst_QItemDelegate::decoration_data()
void tst_QItemDelegate::decoration()
{
+ if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+ QSKIP("Wayland: This fails. Figure out why.");
+
Q_CHECK_PAINTEVENTS
QFETCH(int, type);
@@ -1282,6 +1285,9 @@ void tst_QItemDelegate::enterKey_data()
void tst_QItemDelegate::enterKey()
{
+ if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+ QSKIP("Wayland: This fails. Figure out why.");
+
QFETCH(WidgetType, widget);
QFETCH(int, key);
QFETCH(bool, expectedFocus);
@@ -1343,6 +1349,9 @@ void tst_QItemDelegate::enterKey()
void tst_QItemDelegate::task257859_finalizeEdit()
{
+ if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+ QSKIP("Wayland: This fails. Figure out why.");
+
QStandardItemModel model;
model.appendRow(new QStandardItem());
@@ -1438,6 +1447,9 @@ void tst_QItemDelegate::testLineEditValidation_data()
void tst_QItemDelegate::testLineEditValidation()
{
+ if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+ QSKIP("Wayland: This fails. Figure out why.");
+
QFETCH(int, key);
struct TestDelegate : public QItemDelegate
diff --git a/tests/auto/widgets/itemviews/qitemview/tst_qitemview.cpp b/tests/auto/widgets/itemviews/qitemview/tst_qitemview.cpp
index 10beacbe75..93da040af6 100644
--- a/tests/auto/widgets/itemviews/qitemview/tst_qitemview.cpp
+++ b/tests/auto/widgets/itemviews/qitemview/tst_qitemview.cpp
@@ -435,6 +435,9 @@ void touch(QWidget *widget, Qt::KeyboardModifier modifier, Qt::Key keyPress)
*/
void tst_QItemView::spider()
{
+ if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+ QSKIP("Wayland: This fails. Figure out why.");
+
QFETCH(QString, viewType);
QFETCH(QAbstractItemView::ScrollMode, vscroll);
QFETCH(QAbstractItemView::ScrollMode, hscroll);
diff --git a/tests/auto/widgets/itemviews/qlistview/tst_qlistview.cpp b/tests/auto/widgets/itemviews/qlistview/tst_qlistview.cpp
index aef2d26137..8c1cff79ec 100644
--- a/tests/auto/widgets/itemviews/qlistview/tst_qlistview.cpp
+++ b/tests/auto/widgets/itemviews/qlistview/tst_qlistview.cpp
@@ -1322,6 +1322,9 @@ void tst_QListView::scrollBarAsNeeded_data()
void tst_QListView::scrollBarAsNeeded()
{
+ if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+ QSKIP("Wayland: This fails. Figure out why.");
+
QFETCH(QSize, size);
QFETCH(int, itemCount);
QFETCH(QAbstractItemView::ScrollMode, verticalScrollMode);
@@ -1505,6 +1508,9 @@ void tst_QListView::task203585_selectAll()
void tst_QListView::task228566_infiniteRelayout()
{
+ if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+ QSKIP("Wayland: This fails. Figure out why.");
+
QListView view;
QStringList list;
@@ -1588,6 +1594,9 @@ void tst_QListView::task196118_visualRegionForSelection()
void tst_QListView::task254449_draggingItemToNegativeCoordinates()
{
+ if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+ QSKIP("Wayland: This fails. Figure out why.");
+
//we'll check that the items are painted correctly
PublicListView list;
QStandardItemModel model(1, 1);
@@ -1627,6 +1636,9 @@ void tst_QListView::task254449_draggingItemToNegativeCoordinates()
void tst_QListView::keyboardSearch()
{
+ if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+ QSKIP("Wayland: This fails. Figure out why.");
+
QStringListModel model({"AB", "AC", "BA", "BB", "BD", "KAFEINE",
"KONQUEROR", "KOPETE", "KOOKA", "OKULAR"});
@@ -1708,6 +1720,9 @@ void tst_QListView::shiftSelectionWithNonUniformItemSizes()
void tst_QListView::shiftSelectionWithItemAlignment()
{
+ if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+ QSKIP("Wayland: This fails. Figure out why.");
+
QStringList items;
for (int c = 0; c < 2; c++) {
for (int i = 10; i > 0; i--)
@@ -1778,6 +1793,9 @@ void tst_QListView::clickOnViewportClearsSelection()
void tst_QListView::task262152_setModelColumnNavigate()
{
+ if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+ QSKIP("Wayland: This fails. Figure out why.");
+
QListView view;
QStandardItemModel model(3,2);
model.setItem(0, 1, new QStandardItem("[0,1]"));
diff --git a/tests/auto/widgets/itemviews/qlistwidget/tst_qlistwidget.cpp b/tests/auto/widgets/itemviews/qlistwidget/tst_qlistwidget.cpp
index befb45e683..cb083fdcbe 100644
--- a/tests/auto/widgets/itemviews/qlistwidget/tst_qlistwidget.cpp
+++ b/tests/auto/widgets/itemviews/qlistwidget/tst_qlistwidget.cpp
@@ -1587,6 +1587,9 @@ public:
void tst_QListWidget::fastScroll()
{
+ if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+ QSKIP("Wayland: This fails. Figure out why.");
+
QWidget topLevel;
MyListWidget widget(&topLevel);
for (int i = 0; i < 50; ++i)
@@ -1654,6 +1657,9 @@ void tst_QListWidget::task199503_crashWhenCleared()
void tst_QListWidget::task217070_scrollbarsAdjusted()
{
+ if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+ QSKIP("Wayland: This fails. Figure out why.");
+
//This task was mailing for style using SH_ScrollView_FrameOnlyAroundContents such as QMotifStyle
QListWidget v;
for (int i = 0; i < 200;i++)
@@ -1743,6 +1749,9 @@ public:
void tst_QListWidget::QTBUG14363_completerWithAnyKeyPressedEditTriggers()
{
+ if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+ QSKIP("Wayland: This fails. Figure out why.");
+
QListWidget listWidget;
listWidget.setEditTriggers(QAbstractItemView::AnyKeyPressed);
listWidget.setItemDelegate(new ItemDelegate(&listWidget));
diff --git a/tests/auto/widgets/itemviews/qtableview/tst_qtableview.cpp b/tests/auto/widgets/itemviews/qtableview/tst_qtableview.cpp
index 09990ab70a..142db4334c 100644
--- a/tests/auto/widgets/itemviews/qtableview/tst_qtableview.cpp
+++ b/tests/auto/widgets/itemviews/qtableview/tst_qtableview.cpp
@@ -585,6 +585,9 @@ void tst_QTableView::keyboardNavigation_data()
void tst_QTableView::keyboardNavigation()
{
+ if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+ QSKIP("Wayland: This fails. Figure out why.");
+
QFETCH(int, rowCount);
QFETCH(int, columnCount);
QFETCH(bool, tabKeyNavigation);
@@ -1254,6 +1257,9 @@ void tst_QTableView::moveCursorStrikesBack_data()
void tst_QTableView::moveCursorStrikesBack()
{
+ if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+ QSKIP("Wayland: This fails. Figure out why.");
+
QFETCH(int, hideRow);
QFETCH(int, hideColumn);
QFETCH(const IntList, disableRows);
@@ -3240,6 +3246,9 @@ void tst_QTableView::spans()
void tst_QTableView::spansAfterRowInsertion()
{
+ if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+ QSKIP("Wayland: This fails. Figure out why.");
+
QtTestTableModel model(10, 10);
QtTestTableView view;
view.setModel(&model);
@@ -3276,6 +3285,9 @@ void tst_QTableView::spansAfterRowInsertion()
void tst_QTableView::spansAfterColumnInsertion()
{
+ if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+ QSKIP("Wayland: This fails. Figure out why.");
+
QtTestTableModel model(10, 10);
QtTestTableView view;
view.setModel(&model);
@@ -3312,6 +3324,9 @@ void tst_QTableView::spansAfterColumnInsertion()
void tst_QTableView::spansAfterRowRemoval()
{
+ if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+ QSKIP("Wayland: This fails. Figure out why.");
+
QtTestTableModel model(10, 10);
QtTestTableView view;
view.setModel(&model);
@@ -3353,6 +3368,9 @@ void tst_QTableView::spansAfterRowRemoval()
void tst_QTableView::spansAfterColumnRemoval()
{
+ if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+ QSKIP("Wayland: This fails. Figure out why.");
+
QtTestTableModel model(10, 10);
QtTestTableView view;
view.setModel(&model);
@@ -3509,6 +3527,9 @@ public:
void tst_QTableView::editSpanFromDirections()
{
+ if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+ QSKIP("Wayland: This fails. Figure out why.");
+
QFETCH(const KeyList, keyPresses);
QFETCH(QSharedPointer<QStandardItemModel>, model);
QFETCH(int, row);
@@ -3644,6 +3665,9 @@ QT_END_NAMESPACE
void tst_QTableView::tabFocus()
{
+ if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+ QSKIP("Wayland: This fails. Figure out why.");
+
if (!qt_tab_all_widgets())
QSKIP("This test requires full keyboard control to be enabled.");
@@ -4069,6 +4093,9 @@ struct ValueSaver {
void tst_QTableView::task191545_dragSelectRows()
{
+ if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+ QSKIP("Wayland: This fails. Figure out why.");
+
QStandardItemModel model(10, 10);
QTableView table;
table.setModel(&model);
diff --git a/tests/auto/widgets/itemviews/qtreeview/tst_qtreeview.cpp b/tests/auto/widgets/itemviews/qtreeview/tst_qtreeview.cpp
index 44195d3b25..dcffe8043b 100644
--- a/tests/auto/widgets/itemviews/qtreeview/tst_qtreeview.cpp
+++ b/tests/auto/widgets/itemviews/qtreeview/tst_qtreeview.cpp
@@ -1208,6 +1208,9 @@ void tst_QTreeView::keyboardSearch()
void tst_QTreeView::keyboardSearchMultiColumn()
{
+ if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+ QSKIP("Wayland: This fails. Figure out why.");
+
QTreeView view;
QStandardItemModel model(4, 2);
@@ -1886,6 +1889,9 @@ void tst_QTreeView::moveCursor_data()
void tst_QTreeView::moveCursor()
{
+ if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+ QSKIP("Wayland: This fails. Figure out why.");
+
QFETCH(bool, uniformRowHeights);
QFETCH(bool, scrollPerPixel);
QtTestModel model(8, 6);
@@ -3536,6 +3542,9 @@ void tst_QTreeView::task203696_hidingColumnsAndRowsn()
void tst_QTreeView::addRowsWhileSectionsAreHidden()
{
+ if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+ QSKIP("Wayland: This fails. Figure out why.");
+
QTreeView view;
for (int pass = 1; pass <= 2; ++pass) {
QStandardItemModel *model = new QStandardItemModel(6, pass, &view);
@@ -3602,6 +3611,9 @@ void tst_QTreeView::task216717_updateChildren()
void tst_QTreeView::task220298_selectColumns()
{
+ if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+ QSKIP("Wayland: This fails. Figure out why.");
+
//this is a very simple 3x3 model where the internalId of the index are different for each cell
class Model : public QAbstractTableModel
{
@@ -3644,6 +3656,9 @@ void tst_QTreeView::task220298_selectColumns()
void tst_QTreeView::task224091_appendColumns()
{
+ if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+ QSKIP("Wayland: This fails. Figure out why.");
+
QStandardItemModel *model = new QStandardItemModel();
QWidget* topLevel= new QWidget;
setFrameless(topLevel);
@@ -3803,6 +3818,9 @@ void tst_QTreeView::task202039_closePersistentEditor()
void tst_QTreeView::task238873_avoidAutoReopening()
{
+ if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+ QSKIP("Wayland: This fails. Figure out why.");
+
QStandardItemModel model;
QStandardItem item0("row 0");
@@ -3889,6 +3907,9 @@ void tst_QTreeView::task246536_scrollbarsNotWorking()
void tst_QTreeView::task250683_wrongSectionSize()
{
+ if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+ QSKIP("Wayland: This fails. Figure out why.");
+
QStandardItemModel model;
populateFakeDirModel(&model);
@@ -4027,6 +4048,9 @@ void tst_QTreeView::task245654_changeModelAndExpandAll()
void tst_QTreeView::doubleClickedWithSpans()
{
+ if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+ QSKIP("Wayland: This fails. Figure out why.");
+
QTreeView view;
QStandardItemModel model(1, 2);
view.setModel(&model);
@@ -4120,6 +4144,9 @@ void tst_QTreeView::taskQTBUG_9216_setSizeAndUniformRowHeightsWrongRepaint()
void tst_QTreeView::keyboardNavigationWithDisabled()
{
+ if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+ QSKIP("Wayland: This fails. Figure out why.");
+
QWidget topLevel;
QTreeView view(&topLevel);
QStandardItemModel model(90, 0);
@@ -4492,6 +4519,9 @@ void tst_QTreeView::taskQTBUG_8176_emitOnExpandAll()
void tst_QTreeView::testInitialFocus()
{
+ if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+ QSKIP("Wayland: This fails. Figure out why.");
+
QTreeWidget treeWidget;
treeWidget.setColumnCount(5);
new QTreeWidgetItem(&treeWidget, QString("1;2;3;4;5").split(QLatin1Char(';')));
@@ -4690,6 +4720,9 @@ void tst_QTreeView::statusTip_data()
void tst_QTreeView::statusTip()
{
+ if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+ QSKIP("Wayland: This fails. Figure out why.");
+
QFETCH(bool, intermediateParent);
QMainWindow mw;
QtTestModel model(5, 5);
@@ -4759,6 +4792,9 @@ public:
void tst_QTreeView::fetchMoreOnScroll()
{
+ if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+ QSKIP("Wayland: This fails. Figure out why.");
+
QTreeView tw;
FetchMoreModel im;
tw.setModel(&im);
@@ -4819,6 +4855,9 @@ void tst_QTreeView::taskQTBUG_8376()
void tst_QTreeView::taskQTBUG_61476()
{
+ if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+ QSKIP("Wayland: This fails. Figure out why.");
+
// This checks that if a user clicks on an item to collapse it that it
// does not edit (in this case change the check state) the item that is
// now over the mouse just because it got a release event
diff --git a/tests/auto/widgets/itemviews/qtreewidget/tst_qtreewidget.cpp b/tests/auto/widgets/itemviews/qtreewidget/tst_qtreewidget.cpp
index 6b8beccbdc..2118bb5a29 100644
--- a/tests/auto/widgets/itemviews/qtreewidget/tst_qtreewidget.cpp
+++ b/tests/auto/widgets/itemviews/qtreewidget/tst_qtreewidget.cpp
@@ -457,6 +457,9 @@ void tst_QTreeWidget::editItem_data()
void tst_QTreeWidget::editItem()
{
+ if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+ QSKIP("Wayland: This fails. Figure out why.");
+
QFETCH(TreeItemList, topLevelItems);
QTreeWidget tree;
@@ -3035,6 +3038,9 @@ void tst_QTreeWidget::defaultRowSizes()
void tst_QTreeWidget::task191552_rtl()
{
+ if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+ QSKIP("Wayland: This fails. Figure out why.");
+
Qt::LayoutDirection oldDir = QGuiApplication::layoutDirection();
QGuiApplication::setLayoutDirection(Qt::RightToLeft);
@@ -3148,6 +3154,9 @@ void tst_QTreeWidget::task245280_sortChildren()
void tst_QTreeWidget::task253109_itemHeight()
{
+ if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+ QSKIP("Wayland: This fails. Figure out why.");
+
QTreeWidget treeWidget;
treeWidget.setColumnCount(1);
treeWidget.show();
@@ -3375,6 +3384,9 @@ void tst_QTreeWidget::setTextUpdate()
void tst_QTreeWidget::taskQTBUG2844_visualItemRect()
{
+ if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+ QSKIP("Wayland: This fails. Figure out why.");
+
PublicTreeWidget tree;
tree.resize(150, 100);
tree.setColumnCount(3);
@@ -3514,6 +3526,9 @@ void tst_QTreeWidget::getMimeDataWithInvalidItem()
// (-> logical index != visual index). see QTBUG-28733
void tst_QTreeWidget::testVisualItemRect()
{
+ if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+ QSKIP("Wayland: This fails. Figure out why.");
+
QTreeWidget tw;
tw.setColumnCount(2);
QTreeWidgetItem *item = new QTreeWidgetItem(&tw);
diff --git a/tests/auto/widgets/kernel/qaction/tst_qaction.cpp b/tests/auto/widgets/kernel/qaction/tst_qaction.cpp
index 0d62c2cd4b..1247f48dd0 100644
--- a/tests/auto/widgets/kernel/qaction/tst_qaction.cpp
+++ b/tests/auto/widgets/kernel/qaction/tst_qaction.cpp
@@ -35,6 +35,7 @@
#include <qaction.h>
#include <qmenu.h>
#include <qpa/qplatformtheme.h>
+#include <qpa/qplatformintegration.h>
#include <private/qguiapplication_p.h>
class tst_QAction : public QObject
@@ -409,6 +410,9 @@ void tst_QAction::task229128TriggeredSignalWhenInActiongroup()
void tst_QAction::repeat()
{
+ if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+ QSKIP("Wayland: This fails. Figure out why.");
+
MyWidget testWidget(this);
testWidget.show();
QApplication::setActiveWindow(&testWidget);
@@ -484,6 +488,9 @@ void tst_QAction::disableShortcutsWithBlockedWidgets_data()
void tst_QAction::disableShortcutsWithBlockedWidgets()
{
+ if (!QGuiApplicationPrivate::platformIntegration()->hasCapability(QPlatformIntegration::WindowActivation))
+ QSKIP("Window activation is not supported");
+
QMainWindow window;
QFETCH(Qt::ShortcutContext, shortcutContext);
@@ -528,6 +535,9 @@ protected:
// ShortcutOverride event first before passing it on as a normal KeyEvent.
void tst_QAction::shortcutFromKeyEvent()
{
+ if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+ QSKIP("Wayland: This fails. Figure out why.");
+
ShortcutOverrideWidget testWidget;
QAction action;
action.setShortcut(Qt::Key_1);
diff --git a/tests/auto/widgets/kernel/qapplication/tst_qapplication.cpp b/tests/auto/widgets/kernel/qapplication/tst_qapplication.cpp
index 367a5767c4..8a5eff3fac 100644
--- a/tests/auto/widgets/kernel/qapplication/tst_qapplication.cpp
+++ b/tests/auto/widgets/kernel/qapplication/tst_qapplication.cpp
@@ -1704,6 +1704,9 @@ void tst_QApplication::focusMouseClick()
int argc = 1;
QApplication app(argc, &argv0);
+ if (!QGuiApplicationPrivate::platformIntegration()->hasCapability(QPlatformIntegration::WindowActivation))
+ QSKIP("Window activation is not supported");
+
QWidget w;
w.setWindowTitle(QLatin1String(QTest::currentTestFunction()));
w.setFocusPolicy(Qt::StrongFocus);
diff --git a/tests/auto/widgets/kernel/qshortcut/tst_qshortcut.cpp b/tests/auto/widgets/kernel/qshortcut/tst_qshortcut.cpp
index 84120c70e9..82ab9c9c3b 100644
--- a/tests/auto/widgets/kernel/qshortcut/tst_qshortcut.cpp
+++ b/tests/auto/widgets/kernel/qshortcut/tst_qshortcut.cpp
@@ -612,6 +612,9 @@ ButtonWidget::ButtonWidget()
// ------------------------------------------------------------------
void tst_QShortcut::disabledItems()
{
+ if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+ QSKIP("Wayland: This fails. Figure out why.");
+
ButtonWidget mainW;
mainW.setWindowTitle(QTest::currentTestFunction());
mainW.show();
@@ -692,6 +695,9 @@ void tst_QShortcut::disabledItems()
// ------------------------------------------------------------------
void tst_QShortcut::ambiguousRotation()
{
+ if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+ QSKIP("Wayland: This fails. Figure out why.");
+
MainWindow mainW;
const QString name = QLatin1String(QTest::currentTestFunction());
mainW.setWindowTitle(name);
@@ -834,6 +840,9 @@ void tst_QShortcut::ambiguousRotation()
void tst_QShortcut::ambiguousItems()
{
+ if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+ QSKIP("Wayland: This fails. Figure out why.");
+
ButtonWidget mainW;
mainW.setWindowTitle(QTest::currentTestFunction());
mainW.show();
@@ -874,6 +883,9 @@ void tst_QShortcut::ambiguousItems()
// ------------------------------------------------------------------
void tst_QShortcut::unicodeCompare()
{
+ if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+ QSKIP("Wayland: This fails. Figure out why.");
+
ButtonWidget mainW;
mainW.setWindowTitle(QTest::currentTestFunction());
mainW.show();
@@ -906,6 +918,9 @@ void tst_QShortcut::unicodeCompare()
// ------------------------------------------------------------------
void tst_QShortcut::keypressConsumption()
{
+ if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+ QSKIP("Wayland: This fails. Figure out why.");
+
MainWindow mainW;
mainW.setWindowTitle(QTest::currentTestFunction());
mainW.show();
@@ -1099,6 +1114,9 @@ public:
void tst_QShortcut::duplicatedShortcutOverride()
{
+ if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+ QSKIP("Wayland: This fails. Figure out why.");
+
OverrideCountingWidget w;
w.setWindowTitle(Q_FUNC_INFO);
w.resize(200, 200);
@@ -1199,6 +1217,9 @@ void tst_QShortcut::sendKeyEvents(QWidget *w, int k1, QChar c1, int k2, QChar c2
void tst_QShortcut::testElement()
{
+ if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+ QSKIP("Wayland: This fails. Figure out why.");
+
static QScopedPointer<MainWindow> mainW;
currentResult = NoResult;
@@ -1243,6 +1264,9 @@ void tst_QShortcut::testElement()
void tst_QShortcut::shortcutToFocusProxy()
{
+ if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+ QSKIP("Wayland: This fails. Figure out why.");
+
QLineEdit le;
QCompleter completer;
QStringListModel *slm = new QStringListModel(QStringList() << "a0" << "a1" << "a2", &completer);
diff --git a/tests/auto/widgets/kernel/qstackedlayout/tst_qstackedlayout.cpp b/tests/auto/widgets/kernel/qstackedlayout/tst_qstackedlayout.cpp
index 10712ea9ad..053dc03296 100644
--- a/tests/auto/widgets/kernel/qstackedlayout/tst_qstackedlayout.cpp
+++ b/tests/auto/widgets/kernel/qstackedlayout/tst_qstackedlayout.cpp
@@ -92,6 +92,9 @@ tst_QStackedLayout::tst_QStackedLayout()
void tst_QStackedLayout::init()
{
+ if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+ QSKIP("Wayland: This fails. Figure out why.");
+
if (testWidget) {
delete testWidget;
testWidget = 0;
diff --git a/tests/auto/widgets/kernel/qtooltip/tst_qtooltip.cpp b/tests/auto/widgets/kernel/qtooltip/tst_qtooltip.cpp
index 3d609d0b9c..053f4948a7 100644
--- a/tests/auto/widgets/kernel/qtooltip/tst_qtooltip.cpp
+++ b/tests/auto/widgets/kernel/qtooltip/tst_qtooltip.cpp
@@ -96,6 +96,9 @@ void tst_QToolTip::task183679_data()
void tst_QToolTip::task183679()
{
+ if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+ QSKIP("Wayland: This fails. Figure out why.");
+
QFETCH(Qt::Key, key);
QFETCH(bool, visible);
@@ -200,6 +203,9 @@ static QByteArray msgSizeTooSmall(const QSize &actual, const QSize &expected)
// Set a large font size and verify that the tool tip is big enough.
void tst_QToolTip::qtbug64550_stylesheet()
{
+ if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+ QSKIP("Wayland: This fails. Figure out why.");
+
Widget_task183679 widget;
widget.setStyleSheet(QStringLiteral("* { font-size: 48pt; }\n"));
widget.show();
diff --git a/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp b/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp
index 40377eb946..c29d1bbe04 100644
--- a/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp
+++ b/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp
@@ -858,6 +858,9 @@ void tst_QWidget::palettePropagation()
void tst_QWidget::palettePropagation2()
{
+ if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+ QSKIP("Wayland: This fails. Figure out why.");
+
// ! Note, the code below is executed in tst_QWidget's constructor.
// QPalette palette;
// font.setColor(QPalette::ToolTipBase, QColor(12, 13, 14));
@@ -1018,6 +1021,9 @@ void tst_QWidget::ignoreKeyEventsWhenDisabled_QTBUG27417()
void tst_QWidget::properTabHandlingWhenDisabled_QTBUG27417()
{
+ if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+ QSKIP("Wayland: This fails. Figure out why.");
+
QWidget widget;
widget.setWindowTitle(__FUNCTION__);
widget.setMinimumWidth(m_testWidgetSize.width());
@@ -1679,6 +1685,9 @@ public:
void tst_QWidget::defaultTabOrder()
{
+ if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+ QSKIP("Wayland: This fails. Figure out why.");
+
const int compositeCount = 2;
Container container;
Composite *composite[compositeCount];
@@ -1733,6 +1742,9 @@ void tst_QWidget::defaultTabOrder()
void tst_QWidget::reverseTabOrder()
{
+ if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+ QSKIP("Wayland: This fails. Figure out why.");
+
const int compositeCount = 2;
Container container;
container.setWindowTitle(QLatin1String(QTest::currentTestFunction()));
@@ -1792,6 +1804,9 @@ void tst_QWidget::reverseTabOrder()
void tst_QWidget::tabOrderWithProxy()
{
+ if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+ QSKIP("Wayland: This fails. Figure out why.");
+
const int compositeCount = 2;
Container container;
container.setWindowTitle(QLatin1String(QTest::currentTestFunction()));
@@ -1850,6 +1865,9 @@ void tst_QWidget::tabOrderWithProxy()
void tst_QWidget::tabOrderWithCompoundWidgets()
{
+ if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+ QSKIP("Wayland: This fails. Figure out why.");
+
const int compositeCount = 4;
Container container;
container.setWindowTitle(QLatin1String(QTest::currentTestFunction()));
@@ -2038,6 +2056,9 @@ void tst_QWidget::tabOrderNoChange2()
void tst_QWidget::appFocusWidgetWithFocusProxyLater()
{
+ if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+ QSKIP("Wayland: This fails. Figure out why.");
+
// Given a lineedit without a focus proxy
QWidget window;
window.setWindowTitle(QTest::currentTestFunction());
@@ -2062,6 +2083,9 @@ void tst_QWidget::appFocusWidgetWithFocusProxyLater()
void tst_QWidget::appFocusWidgetWhenLosingFocusProxy()
{
+ if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+ QSKIP("Wayland: This fails. Figure out why.");
+
// Given a lineedit with a focus proxy
QWidget window;
window.setWindowTitle(QTest::currentTestFunction());
@@ -3974,6 +3998,9 @@ void tst_QWidget::optimizedResizeMove()
void tst_QWidget::optimizedResize_topLevel()
{
+ if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+ QSKIP("Wayland: This fails. Figure out why.");
+
if (QHighDpiScaling::isActive())
QSKIP("Skip due to rounding errors in the regions.");
StaticWidget topLevel;
@@ -4089,6 +4116,9 @@ void tst_QWidget::setMaximumSize()
void tst_QWidget::setFixedSize()
{
+ if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+ QSKIP("Wayland: This fails. Figure out why.");
+
QWidget w;
QSize defaultSize = w.size();
@@ -5638,6 +5668,9 @@ public:
void tst_QWidget::setFocus()
{
+ if (!QGuiApplicationPrivate::platformIntegration()->hasCapability(QPlatformIntegration::WindowActivation))
+ QSKIP("Window activation is not supported");
+
QScopedPointer<QWidget> testWidget(new QWidget);
testWidget->resize(m_testWidgetSize);
testWidget->setWindowTitle(__FUNCTION__);
@@ -8885,6 +8918,9 @@ public:
void tst_QWidget::translucentWidget()
{
+ if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+ QSKIP("Wayland: This fails. Figure out why.");
+
QPixmap pm(16,16);
pm.fill(Qt::red);
ColorRedWidget label;
@@ -8954,6 +8990,9 @@ public slots:
void tst_QWidget::setClearAndResizeMask()
{
+ if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+ QSKIP("Wayland: This fails. Figure out why.");
+
UpdateWidget topLevel;
topLevel.setWindowTitle(QLatin1String(QTest::currentTestFunction()));
topLevel.resize(160, 160);
@@ -9522,6 +9561,9 @@ void tst_QWidget::updateOnDestroyedSignal()
void tst_QWidget::toplevelLineEditFocus()
{
+ if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+ QSKIP("Wayland: This fails. Figure out why.");
+
QLineEdit w;
w.setWindowTitle(QLatin1String(QTest::currentTestFunction()));
w.setMinimumWidth(m_testWidgetSize.width());
@@ -9974,6 +10016,9 @@ void tst_QWidget::taskQTBUG_17333_ResizeInfiniteRecursion()
void tst_QWidget::nativeChildFocus()
{
+ if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+ QSKIP("Wayland: This fails. Figure out why.");
+
QWidget w;
w.setWindowTitle(QLatin1String(QTest::currentTestFunction()));
w.setMinimumWidth(m_testWidgetSize.width());
@@ -10112,6 +10157,9 @@ private:
void tst_QWidget::grabMouse()
{
+ if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+ QSKIP("Wayland: This fails. Figure out why.");
+
QStringList log;
GrabLoggerWidget w(&log);
w.setWindowTitle(QLatin1String(QTest::currentTestFunction()));
@@ -10147,6 +10195,9 @@ void tst_QWidget::grabMouse()
void tst_QWidget::grabKeyboard()
{
+ if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+ QSKIP("Wayland: This fails. Figure out why.");
+
QWidget w;
w.setWindowTitle(QLatin1String(QTest::currentTestFunction()));
w.setObjectName(QLatin1String("tst_qwidget_grabKeyboard"));
diff --git a/tests/auto/widgets/kernel/qwidget_window/tst_qwidget_window.cpp b/tests/auto/widgets/kernel/qwidget_window/tst_qwidget_window.cpp
index c6b5669965..7d114fde56 100644
--- a/tests/auto/widgets/kernel/qwidget_window/tst_qwidget_window.cpp
+++ b/tests/auto/widgets/kernel/qwidget_window/tst_qwidget_window.cpp
@@ -411,6 +411,9 @@ void tst_QWidget_window::tst_paintEventOnSecondShow()
void tst_QWidget_window::tst_exposeObscuredMapped_QTBUG39220()
{
+ if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+ QSKIP("Wayland: This fails. Figure out why.");
+
const auto integration = QGuiApplicationPrivate::platformIntegration();
if (!integration->hasCapability(QPlatformIntegration::MultipleWindows)
|| !integration->hasCapability(QPlatformIntegration::NonFullScreenWindows)
@@ -438,6 +441,9 @@ void tst_QWidget_window::tst_exposeObscuredMapped_QTBUG39220()
void tst_QWidget_window::tst_paintEventOnResize_QTBUG50796()
{
+ if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+ QSKIP("Wayland: This fails. Figure out why.");
+
const QRect availableGeo = QGuiApplication::primaryScreen()->availableGeometry();
QWidget root;
@@ -582,6 +588,9 @@ static QString msgEventAccepted(const QDropEvent &e)
void tst_QWidget_window::tst_dnd()
{
+ if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+ QSKIP("Wayland: This fails. Figure out why.");
+
QStringList log;
DnDEventLoggerWidget dndTestWidget(&log);
@@ -819,6 +828,9 @@ public:
void tst_QWidget_window::tst_dnd_propagation()
{
+ if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+ QSKIP("Wayland: This fails. Figure out why.");
+
QMimeData mimeData;
mimeData.setText(QLatin1String("testmimetext"));
@@ -1066,6 +1078,9 @@ protected:
void tst_QWidget_window::tst_eventfilter_on_toplevel()
{
+ if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+ QSKIP("Wayland: This fails. Figure out why.");
+
QWidget w;
EventFilter filter;
w.installEventFilter(&filter);
@@ -1124,6 +1139,9 @@ void tst_QWidget_window::QTBUG_50561_QCocoaBackingStore_paintDevice_crash()
void tst_QWidget_window::setWindowState_data()
{
+ if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+ QSKIP("Wayland: This fails. Figure out why.");
+
QString platformName = QGuiApplication::platformName().toLower();
QTest::addColumn<Qt::WindowStates>("state");
diff --git a/tests/auto/widgets/kernel/qwindowcontainer/tst_qwindowcontainer.cpp b/tests/auto/widgets/kernel/qwindowcontainer/tst_qwindowcontainer.cpp
index 693a792f0a..98aebfe975 100644
--- a/tests/auto/widgets/kernel/qwindowcontainer/tst_qwindowcontainer.cpp
+++ b/tests/auto/widgets/kernel/qwindowcontainer/tst_qwindowcontainer.cpp
@@ -93,6 +93,9 @@ void tst_QWindowContainer::cleanup()
void tst_QWindowContainer::testShow()
{
+ if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+ QSKIP("Wayland: This fails. Figure out why.");
+
QWidget root;
root.setWindowTitle(QTest::currentTestFunction());
root.setGeometry(m_availableGeometry.x() + 100, m_availableGeometry.y() + 100, 400, 400);
@@ -135,6 +138,9 @@ void tst_QWindowContainer::testPositionAndSize()
void tst_QWindowContainer::testExposeObscure()
{
+ if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+ QSKIP("Wayland: This fails. Figure out why.");
+
Window *window = new Window();
QScopedPointer<QWidget> container(QWidget::createWindowContainer(window));
@@ -187,6 +193,9 @@ void tst_QWindowContainer::testBehindTheScenesDeletion()
void tst_QWindowContainer::testActivation()
{
+ if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+ QSKIP("Wayland: This fails. Figure out why.");
+
QWidget root;
root.setWindowTitle(QTest::currentTestFunction());
@@ -244,6 +253,9 @@ void tst_QWindowContainer::testUnparenting()
void tst_QWindowContainer::testUnparentReparent()
{
+ if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+ QSKIP("Wayland: This fails. Figure out why.");
+
QWidget root;
QWindow *window = new QWindow();
@@ -357,6 +369,9 @@ void tst_QWindowContainer::testDockWidget()
void tst_QWindowContainer::testNativeContainerParent()
{
+ if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+ QSKIP("Wayland: This fails. Figure out why.");
+
QWidget root;
root.setWindowTitle(QTest::currentTestFunction());
root.setGeometry(m_availableGeometry.x() + 50, m_availableGeometry.y() + 50, 200, 200);
diff --git a/tests/auto/widgets/styles/qstylesheetstyle/tst_qstylesheetstyle.cpp b/tests/auto/widgets/styles/qstylesheetstyle/tst_qstylesheetstyle.cpp
index 400e46cb97..0ae2e6626f 100644
--- a/tests/auto/widgets/styles/qstylesheetstyle/tst_qstylesheetstyle.cpp
+++ b/tests/auto/widgets/styles/qstylesheetstyle/tst_qstylesheetstyle.cpp
@@ -958,6 +958,9 @@ void tst_QStyleSheetStyle::focusColors()
"That doesn't mean that the feature doesn't work in practice.");
#endif
+ if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+ QSKIP("Wayland: This fails. Figure out why.");
+
TestDialog frame(QStringLiteral("*:focus { border:none; background: #e8ff66; color: #ff0084 }"));
frame.setWindowTitle(QTest::currentTestFunction());
@@ -995,6 +998,9 @@ void tst_QStyleSheetStyle::hoverColors()
#ifdef Q_OS_OSX
QSKIP("This test is fragile on Mac, most likely due to QTBUG-33959.");
#endif
+ if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+ QSKIP("Wayland: This fails. Figure out why.");
+
TestDialog frame(QStringLiteral("*:hover { border:none; background: #e8ff66; color: #ff0084 }"));
frame.setWindowTitle(QTest::currentTestFunction());
@@ -1202,6 +1208,9 @@ void tst_QStyleSheetStyle::attributesList()
void tst_QStyleSheetStyle::minmaxSizes()
{
+ if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+ QSKIP("Wayland: This fails. Figure out why.");
+
QTabWidget tabWidget;
tabWidget.resize(m_testSize);
tabWidget.setWindowTitle(QTest::currentTestFunction());
@@ -1242,6 +1251,9 @@ void tst_QStyleSheetStyle::minmaxSizes()
void tst_QStyleSheetStyle::task206238_twice()
{
+ if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+ QSKIP("Wayland: This fails. Figure out why.");
+
const QColor red(Qt::red);
QMainWindow w;
w.resize(m_testSize);
@@ -1416,6 +1428,9 @@ void ProxyStyle::drawControl(ControlElement ce, const QStyleOption *opt,
void tst_QStyleSheetStyle::proxyStyle()
{
+ if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+ QSKIP("Wayland: This fails. Figure out why.");
+
//Should not crash; task 158984
ProxyStyle *proxy = new ProxyStyle(QApplication::style());
@@ -1539,6 +1554,9 @@ private:
void tst_QStyleSheetStyle::toolTip()
{
+ if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+ QSKIP("Wayland: This fails. Figure out why.");
+
qApp->setStyleSheet(QString());
QWidget w;
w.resize(m_testSize);
@@ -1618,6 +1636,9 @@ void tst_QStyleSheetStyle::toolTip()
void tst_QStyleSheetStyle::embeddedFonts()
{
+ if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+ QSKIP("Wayland: This fails. Figure out why.");
+
//task 235622 and 210551
QSpinBox spin;
spin.setWindowTitle(QTest::currentTestFunction());
@@ -1691,6 +1712,9 @@ void tst_QStyleSheetStyle::opaquePaintEvent()
void tst_QStyleSheetStyle::complexWidgetFocus()
{
+ if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+ QSKIP("Wayland: This fails. Figure out why.");
+
// This test is a simplified version of the focusColors() test above.
// Tests if colors can be changed by altering the focus of the widget.
@@ -1737,6 +1761,9 @@ void tst_QStyleSheetStyle::complexWidgetFocus()
void tst_QStyleSheetStyle::task188195_baseBackground()
{
+ if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+ QSKIP("Wayland: This fails. Figure out why.");
+
QTreeView tree;
tree.setWindowTitle(QTest::currentTestFunction());
tree.setStyleSheet( "QTreeView:disabled { background-color:#ab1251; }" );
@@ -1772,6 +1799,9 @@ void tst_QStyleSheetStyle::task188195_baseBackground()
void tst_QStyleSheetStyle::task232085_spinBoxLineEditBg()
{
+ if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+ QSKIP("Wayland: This fails. Figure out why.");
+
// This test is a simplified version of the focusColors() test above.
// Tests if colors can be changed by altering the focus of the widget.
@@ -1905,6 +1935,9 @@ void tst_QStyleSheetStyle::QTBUG15910_crashNullWidget()
void tst_QStyleSheetStyle::QTBUG36933_brokenPseudoClassLookup()
{
+ if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+ QSKIP("Wayland: This fails. Figure out why.");
+
const int rowCount = 10;
const int columnCount = 10;
diff --git a/tests/auto/widgets/util/qcompleter/tst_qcompleter.cpp b/tests/auto/widgets/util/qcompleter/tst_qcompleter.cpp
index ec383e42fd..89c4a74739 100644
--- a/tests/auto/widgets/util/qcompleter/tst_qcompleter.cpp
+++ b/tests/auto/widgets/util/qcompleter/tst_qcompleter.cpp
@@ -1103,6 +1103,9 @@ void tst_QCompleter::modelDeletion()
void tst_QCompleter::multipleWidgets()
{
+ if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+ QSKIP("Wayland: This fails. Figure out why.");
+
QStringList list;
list << "item1" << "item2" << "item2";
QCompleter completer(list);
@@ -1149,6 +1152,9 @@ void tst_QCompleter::multipleWidgets()
void tst_QCompleter::focusIn()
{
+ if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+ QSKIP("Wayland: This fails. Figure out why.");
+
QCompleter completer({"item1", "item2", "item2"});
QWidget window;
@@ -1236,6 +1242,9 @@ void tst_QCompleter::disabledItems()
void tst_QCompleter::task178797_activatedOnReturn()
{
+ if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+ QSKIP("Wayland: This fails. Figure out why.");
+
QLineEdit ledit;
setFrameless(&ledit);
auto completer = new QCompleter({"foobar1", "foobar2"}, &ledit);
@@ -1317,6 +1326,9 @@ private slots:
void tst_QCompleter::task246056_setCompletionPrefix()
{
+ if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+ QSKIP("Wayland: This fails. Figure out why.");
+
task246056_ComboBox comboBox;
setFrameless(&comboBox);
QVERIFY(comboBox.completer());
@@ -1385,6 +1397,9 @@ private:
void tst_QCompleter::task250064_lostFocus()
{
+ if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+ QSKIP("Wayland: This fails. Figure out why.");
+
task250064_Widget widget;
widget.setWindowTitle(QLatin1String(QTest::currentTestFunction()));
widget.show();
@@ -1414,6 +1429,9 @@ void tst_QCompleter::task253125_lineEditCompletion_data()
void tst_QCompleter::task253125_lineEditCompletion()
{
+ if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+ QSKIP("Wayland: This fails. Figure out why.");
+
QFETCH(QStringList, list);
QFETCH(QCompleter::CompletionMode, completionMode);
@@ -1572,6 +1590,9 @@ void tst_QCompleter::task253125_lineEditCompletion()
void tst_QCompleter::task247560_keyboardNavigation()
{
+ if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+ QSKIP("Wayland: This fails. Figure out why.");
+
QStandardItemModel model;
for (int i = 0; i < 5; i++) {
@@ -1682,6 +1703,9 @@ static inline bool testFileSystemReady(const QAbstractItemModel &model)
void tst_QCompleter::QTBUG_14292_filesystem()
{
+ if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+ QSKIP("Wayland: This fails. Figure out why.");
+
// This test tests whether the creation of subdirectories
// does not cause completers based on file system models
// to pop up the completion list due to file changed signals.
@@ -1756,6 +1780,9 @@ void tst_QCompleter::QTBUG_14292_filesystem()
void tst_QCompleter::QTBUG_52028_tabAutoCompletes()
{
+ if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+ QSKIP("Wayland: This fails. Figure out why.");
+
QWidget w;
w.setWindowTitle(QLatin1String(QTest::currentTestFunction()));
w.setLayout(new QVBoxLayout);
@@ -1798,6 +1825,9 @@ void tst_QCompleter::QTBUG_52028_tabAutoCompletes()
void tst_QCompleter::QTBUG_51889_activatedSentTwice()
{
+ if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+ QSKIP("Wayland: This fails. Figure out why.");
+
QWidget w;
w.setWindowTitle(QLatin1String(QTest::currentTestFunction()));
w.setLayout(new QVBoxLayout);
diff --git a/tests/auto/widgets/util/qsystemtrayicon/tst_qsystemtrayicon.cpp b/tests/auto/widgets/util/qsystemtrayicon/tst_qsystemtrayicon.cpp
index 5acaf49e6c..148894dc4e 100644
--- a/tests/auto/widgets/util/qsystemtrayicon/tst_qsystemtrayicon.cpp
+++ b/tests/auto/widgets/util/qsystemtrayicon/tst_qsystemtrayicon.cpp
@@ -106,6 +106,9 @@ void tst_QSystemTrayIcon::getSetCheck()
void tst_QSystemTrayIcon::supportsMessages()
{
+ if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+ QSKIP("Wayland: This fails. Figure out why.");
+
// ### fixme: Check platforms.
const QString platform = QGuiApplication::platformName();
if (platform.compare(QStringLiteral("xcb"), Qt::CaseInsensitive)
diff --git a/tests/auto/widgets/widgets/qabstractbutton/qabstractbutton.pro b/tests/auto/widgets/widgets/qabstractbutton/qabstractbutton.pro
index 2f0111f483..1d9074491e 100644
--- a/tests/auto/widgets/widgets/qabstractbutton/qabstractbutton.pro
+++ b/tests/auto/widgets/widgets/qabstractbutton/qabstractbutton.pro
@@ -1,6 +1,6 @@
CONFIG += testcase
TARGET = tst_qabstractbutton
-QT += widgets testlib
+QT += widgets testlib gui-private
SOURCES += tst_qabstractbutton.cpp
diff --git a/tests/auto/widgets/widgets/qabstractbutton/tst_qabstractbutton.cpp b/tests/auto/widgets/widgets/qabstractbutton/tst_qabstractbutton.cpp
index e77faa1e75..eb108a40de 100644
--- a/tests/auto/widgets/widgets/qabstractbutton/tst_qabstractbutton.cpp
+++ b/tests/auto/widgets/widgets/qabstractbutton/tst_qabstractbutton.cpp
@@ -39,6 +39,9 @@
#include <qgridlayout.h>
#include <qabstractbutton.h>
+#include <private/qguiapplication_p.h>
+#include <qpa/qplatformintegration.h>
+
class tst_QAbstractButton : public QObject
{
Q_OBJECT
@@ -470,6 +473,9 @@ void tst_QAbstractButton::toggled()
void tst_QAbstractButton::setShortcut()
{
+ if (!QGuiApplicationPrivate::platformIntegration()->hasCapability(QPlatformIntegration::WindowActivation))
+ QSKIP("Window activation is not supported");
+
QKeySequence seq( Qt::Key_A );
testWidget->setShortcut( seq );
QApplication::setActiveWindow(testWidget);
diff --git a/tests/auto/widgets/widgets/qabstractspinbox/tst_qabstractspinbox.cpp b/tests/auto/widgets/widgets/qabstractspinbox/tst_qabstractspinbox.cpp
index 0ce3b4cefe..6fb13ed55e 100644
--- a/tests/auto/widgets/widgets/qabstractspinbox/tst_qabstractspinbox.cpp
+++ b/tests/auto/widgets/widgets/qabstractspinbox/tst_qabstractspinbox.cpp
@@ -168,6 +168,9 @@ void tst_QAbstractSpinBox::task228728_cssselector()
void tst_QAbstractSpinBox::inputMethodUpdate()
{
+ if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+ QSKIP("Wayland: This fails. Figure out why.");
+
QSpinBox box;
QSpinBox *testWidget = &box;
diff --git a/tests/auto/widgets/widgets/qbuttongroup/tst_qbuttongroup.cpp b/tests/auto/widgets/widgets/qbuttongroup/tst_qbuttongroup.cpp
index 7684f16c47..47dfc86a69 100644
--- a/tests/auto/widgets/widgets/qbuttongroup/tst_qbuttongroup.cpp
+++ b/tests/auto/widgets/widgets/qbuttongroup/tst_qbuttongroup.cpp
@@ -89,6 +89,9 @@ void tst_QButtonGroup::arrowKeyNavigation()
if (!qt_tab_all_widgets())
QSKIP("This test requires full keyboard control to be enabled.");
+ if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+ QSKIP("Wayland: This fails. Figure out why.");
+
QDialog dlg(0);
QHBoxLayout layout(&dlg);
QGroupBox g1("1", &dlg);
diff --git a/tests/auto/widgets/widgets/qcalendarwidget/tst_qcalendarwidget.cpp b/tests/auto/widgets/widgets/qcalendarwidget/tst_qcalendarwidget.cpp
index 312ec0b1ec..c3ae2ea541 100644
--- a/tests/auto/widgets/widgets/qcalendarwidget/tst_qcalendarwidget.cpp
+++ b/tests/auto/widgets/widgets/qcalendarwidget/tst_qcalendarwidget.cpp
@@ -156,6 +156,9 @@ void tst_QCalendarWidget::buttonClickCheck()
#ifdef Q_OS_WINRT
QSKIP("Fails on WinRT - QTBUG-68297");
#endif
+ if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+ QSKIP("Wayland: This fails. Figure out why.");
+
QCalendarWidget object;
QSize size = object.sizeHint();
object.setGeometry(0,0,size.width(), size.height());
diff --git a/tests/auto/widgets/widgets/qcheckbox/tst_qcheckbox.cpp b/tests/auto/widgets/widgets/qcheckbox/tst_qcheckbox.cpp
index 0cbab5e17c..6dd4f8d2fe 100644
--- a/tests/auto/widgets/widgets/qcheckbox/tst_qcheckbox.cpp
+++ b/tests/auto/widgets/widgets/qcheckbox/tst_qcheckbox.cpp
@@ -78,6 +78,9 @@ private:
void tst_QCheckBox::initTestCase()
{
+ if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+ QSKIP("Wayland: This fails. Figure out why.");
+
// Create the test class
testWidget = new QCheckBox(0);
testWidget->setObjectName("testObject");
diff --git a/tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp b/tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp
index b7869a0653..eed4fe3539 100644
--- a/tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp
+++ b/tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp
@@ -840,6 +840,9 @@ void tst_QComboBox::virtualAutocompletion()
void tst_QComboBox::autoCompletionCaseSensitivity()
{
+ if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+ QSKIP("Wayland: This fails. Figure out why.");
+
//we have put the focus because the completer
//is only used when the widget actually has the focus
TestWidget topLevel;
@@ -1995,6 +1998,9 @@ void tst_QComboBox::flaggedItems_data()
void tst_QComboBox::flaggedItems()
{
+ if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+ QSKIP("Wayland: This fails. Figure out why.");
+
QFETCH(QStringList, itemList);
QFETCH(IntList, deselectFlagList);
QFETCH(IntList, disableFlagList);
@@ -2465,6 +2471,9 @@ void tst_QComboBox::task247863_keyBoardSelection()
void tst_QComboBox::task220195_keyBoardSelection2()
{
+ if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+ QSKIP("Wayland: This fails. Figure out why.");
+
QComboBox combo;
setFrameless(&combo);
combo.move(200, 200);
@@ -2751,6 +2760,9 @@ void tst_QComboBox::resetModel()
void tst_QComboBox::keyBoardNavigationWithMouse()
{
+ if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+ QSKIP("Wayland: This fails. Figure out why.");
+
QComboBox combo;
combo.setEditable(false);
setFrameless(&combo);
@@ -2798,6 +2810,9 @@ void tst_QComboBox::keyBoardNavigationWithMouse()
void tst_QComboBox::task_QTBUG_1071_changingFocusEmitsActivated()
{
+ if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+ QSKIP("Wayland: This fails. Figure out why.");
+
QWidget w;
w.move(200, 200);
QVBoxLayout layout(&w);
@@ -3065,6 +3080,9 @@ void tst_QComboBox::itemData()
void tst_QComboBox::task_QTBUG_31146_popupCompletion()
{
+ if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+ QSKIP("Wayland: This fails. Figure out why.");
+
QComboBox comboBox;
comboBox.setEditable(true);
#if QT_DEPRECATED_SINCE(5, 13)
@@ -3101,6 +3119,9 @@ void tst_QComboBox::task_QTBUG_31146_popupCompletion()
void tst_QComboBox::task_QTBUG_41288_completerChangesCurrentIndex()
{
+ if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+ QSKIP("Wayland: This fails. Figure out why.");
+
QComboBox comboBox;
comboBox.setEditable(true);
@@ -3352,6 +3373,9 @@ void tst_QComboBox::task_QTBUG_56693_itemFontFromModel()
void tst_QComboBox::inputMethodUpdate()
{
+ if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+ QSKIP("Wayland: This fails. Figure out why.");
+
TestWidget topLevel;
topLevel.show();
QVERIFY(QTest::qWaitForWindowExposed(&topLevel));
@@ -3406,6 +3430,9 @@ void tst_QComboBox::inputMethodUpdate()
void tst_QComboBox::task_QTBUG_52027_mapCompleterIndex()
{
+ if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+ QSKIP("Wayland: This fails. Figure out why.");
+
QStringList words;
words << "" << "foobar1" << "foobar2";
diff --git a/tests/auto/widgets/widgets/qcommandlinkbutton/tst_qcommandlinkbutton.cpp b/tests/auto/widgets/widgets/qcommandlinkbutton/tst_qcommandlinkbutton.cpp
index 2e5d24cd26..0044d33c66 100644
--- a/tests/auto/widgets/widgets/qcommandlinkbutton/tst_qcommandlinkbutton.cpp
+++ b/tests/auto/widgets/widgets/qcommandlinkbutton/tst_qcommandlinkbutton.cpp
@@ -110,6 +110,8 @@ void tst_QCommandLinkButton::initTestCase()
testWidget->setObjectName("testWidget");
testWidget->resize( 200, 200 );
testWidget->show();
+ if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+ QSKIP("Wayland: This fails. Figure out why.");
QVERIFY(QTest::qWaitForWindowActive(testWidget));
connect( testWidget, SIGNAL(clicked()), this, SLOT(onClicked()) );
diff --git a/tests/auto/widgets/widgets/qdatetimeedit/tst_qdatetimeedit.cpp b/tests/auto/widgets/widgets/qdatetimeedit/tst_qdatetimeedit.cpp
index 26b4b7d020..aba4651379 100644
--- a/tests/auto/widgets/widgets/qdatetimeedit/tst_qdatetimeedit.cpp
+++ b/tests/auto/widgets/widgets/qdatetimeedit/tst_qdatetimeedit.cpp
@@ -4097,6 +4097,9 @@ void tst_QDateTimeEdit::stepModifierKeys_data()
void tst_QDateTimeEdit::stepModifierKeys()
{
+ if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+ QSKIP("Wayland: This fails. Figure out why.");
+
QFETCH(QDate, startDate);
QFETCH(int, stepModifier);
QFETCH(QDateTimeEdit::Section, section);
@@ -4198,6 +4201,9 @@ void tst_QDateTimeEdit::stepModifierButtons_data()
void tst_QDateTimeEdit::stepModifierButtons()
{
+ if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+ QSKIP("Wayland: This fails. Figure out why.");
+
QFETCH(QStyle::SubControl, subControl);
QFETCH(int, stepModifier);
QFETCH(Qt::KeyboardModifiers, modifiers);
@@ -4285,6 +4291,9 @@ void tst_QDateTimeEdit::stepModifierPressAndHold_data()
void tst_QDateTimeEdit::stepModifierPressAndHold()
{
+ if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+ QSKIP("Wayland: This fails. Figure out why.");
+
QFETCH(QStyle::SubControl, subControl);
QFETCH(int, stepModifier);
QFETCH(Qt::KeyboardModifiers, modifiers);
diff --git a/tests/auto/widgets/widgets/qdialogbuttonbox/tst_qdialogbuttonbox.cpp b/tests/auto/widgets/widgets/qdialogbuttonbox/tst_qdialogbuttonbox.cpp
index 17b0e9ce5f..7e0cb99ea8 100644
--- a/tests/auto/widgets/widgets/qdialogbuttonbox/tst_qdialogbuttonbox.cpp
+++ b/tests/auto/widgets/widgets/qdialogbuttonbox/tst_qdialogbuttonbox.cpp
@@ -828,6 +828,9 @@ void tst_QDialogButtonBox::testDefaultButton()
void tst_QDialogButtonBox::task191642_default()
{
+ if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+ QSKIP("Wayland: This fails. Figure out why.");
+
QDialog dlg;
QPushButton *def = new QPushButton(&dlg);
QSignalSpy clicked(def, SIGNAL(clicked(bool)));
diff --git a/tests/auto/widgets/widgets/qdockwidget/tst_qdockwidget.cpp b/tests/auto/widgets/widgets/qdockwidget/tst_qdockwidget.cpp
index 625116654d..9a16c39014 100644
--- a/tests/auto/widgets/widgets/qdockwidget/tst_qdockwidget.cpp
+++ b/tests/auto/widgets/widgets/qdockwidget/tst_qdockwidget.cpp
@@ -946,6 +946,9 @@ void tst_QDockWidget::task248604_infiniteResize()
void tst_QDockWidget::task258459_visibilityChanged()
{
+ if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+ QSKIP("Wayland: This fails. Figure out why.");
+
QMainWindow win;
QDockWidget dock1, dock2;
win.addDockWidget(Qt::RightDockWidgetArea, &dock1);
diff --git a/tests/auto/widgets/widgets/qdoublespinbox/tst_qdoublespinbox.cpp b/tests/auto/widgets/widgets/qdoublespinbox/tst_qdoublespinbox.cpp
index c760d9cc99..c293a4bdd2 100644
--- a/tests/auto/widgets/widgets/qdoublespinbox/tst_qdoublespinbox.cpp
+++ b/tests/auto/widgets/widgets/qdoublespinbox/tst_qdoublespinbox.cpp
@@ -256,6 +256,10 @@ void tst_QDoubleSpinBox::initTestCase()
testFocusWidget = new QWidget(0);
testFocusWidget->resize(200, 100);
testFocusWidget->show();
+
+ if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+ QSKIP("Wayland: This fails. Figure out why.");
+
QVERIFY(QTest::qWaitForWindowActive(testFocusWidget));
}
diff --git a/tests/auto/widgets/widgets/qfontcombobox/tst_qfontcombobox.cpp b/tests/auto/widgets/widgets/qfontcombobox/tst_qfontcombobox.cpp
index 5392d36ae0..bd3ea5686a 100644
--- a/tests/auto/widgets/widgets/qfontcombobox/tst_qfontcombobox.cpp
+++ b/tests/auto/widgets/widgets/qfontcombobox/tst_qfontcombobox.cpp
@@ -35,6 +35,8 @@ class tst_QFontComboBox : public QObject
Q_OBJECT
private slots:
+ void initTestCase();
+
void qfontcombobox_data();
void qfontcombobox();
void currentFont_data();
@@ -58,6 +60,12 @@ public:
{ return SubQFontComboBox::event(e); }
};
+void tst_QFontComboBox::initTestCase()
+{
+ if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+ QSKIP("Wayland: This freezes. Figure out why.");
+}
+
void tst_QFontComboBox::qfontcombobox_data()
{
}
diff --git a/tests/auto/widgets/widgets/qframe/tst_qframe.cpp b/tests/auto/widgets/widgets/qframe/tst_qframe.cpp
index 05f9cd2e4a..0ca8dc0776 100644
--- a/tests/auto/widgets/widgets/qframe/tst_qframe.cpp
+++ b/tests/auto/widgets/widgets/qframe/tst_qframe.cpp
@@ -159,6 +159,9 @@ void tst_QFrame::testPainting_data()
void tst_QFrame::testPainting()
{
+ if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+ QSKIP("Wayland: This fails. Figure out why.");
+
QFETCH(QString, basename);
QFETCH(int, lineWidth);
QFETCH(int, midLineWidth);
diff --git a/tests/auto/widgets/widgets/qgroupbox/tst_qgroupbox.cpp b/tests/auto/widgets/widgets/qgroupbox/tst_qgroupbox.cpp
index 1b477fbbd0..bf14020b24 100644
--- a/tests/auto/widgets/widgets/qgroupbox/tst_qgroupbox.cpp
+++ b/tests/auto/widgets/widgets/qgroupbox/tst_qgroupbox.cpp
@@ -474,6 +474,9 @@ void tst_QGroupBox::childrenAreDisabled()
void tst_QGroupBox::propagateFocus()
{
+ if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+ QSKIP("Wayland: This fails. Figure out why.");
+
QGroupBox box;
QLineEdit lineEdit(&box);
box.show();
diff --git a/tests/auto/widgets/widgets/qlineedit/tst_qlineedit.cpp b/tests/auto/widgets/widgets/qlineedit/tst_qlineedit.cpp
index 0cfbc651ad..5988987d0d 100644
--- a/tests/auto/widgets/widgets/qlineedit/tst_qlineedit.cpp
+++ b/tests/auto/widgets/widgets/qlineedit/tst_qlineedit.cpp
@@ -1490,6 +1490,9 @@ void tst_QLineEdit::undo_keypressevents()
#ifndef QT_NO_CLIPBOARD
void tst_QLineEdit::QTBUG5786_undoPaste()
{
+ if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+ QSKIP("Wayland: This fails. Figure out why.");
+
if (!PlatformClipboard::isAvailable())
QSKIP("this machine doesn't support the clipboard");
QString initial("initial");
@@ -1700,6 +1703,9 @@ void tst_QLineEdit::displayText()
void tst_QLineEdit::passwordEchoOnEdit()
{
+ if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+ QSKIP("Wayland: This fails. Figure out why.");
+
QStyleOptionFrame opt;
QLineEdit *testWidget = ensureTestWidget();
QChar fillChar = testWidget->style()->styleHint(QStyle::SH_LineEdit_PasswordCharacter, &opt, testWidget);
@@ -1734,6 +1740,9 @@ void tst_QLineEdit::passwordEchoOnEdit()
void tst_QLineEdit::passwordEchoDelay()
{
+ if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+ QSKIP("Wayland: This fails. Figure out why.");
+
QLineEdit *testWidget = ensureTestWidget();
int delay = qGuiApp->styleHints()->passwordMaskDelay();
#if defined QT_BUILD_INTERNAL
@@ -1917,6 +1926,9 @@ public:
void tst_QLineEdit::noCursorBlinkWhenReadOnly()
{
+ if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+ QSKIP("Wayland: This fails. Figure out why.");
+
int cursorFlashTime = QApplication::cursorFlashTime();
if (cursorFlashTime == 0)
return;
@@ -3014,6 +3026,9 @@ void tst_QLineEdit::setSelection()
#ifndef QT_NO_CLIPBOARD
void tst_QLineEdit::cut()
{
+ if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+ QSKIP("Wayland: This fails. Figure out why.");
+
if (!PlatformClipboard::isAvailable())
QSKIP("Autotests run from cron and pasteboard don't get along quite ATM");
@@ -3079,6 +3094,9 @@ void tst_QLineEdit::cut()
void tst_QLineEdit::cutWithoutSelection()
{
+ if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+ QSKIP("Wayland: This fails. Figure out why.");
+
enum { selectionLength = 1 };
if (QKeySequence(QKeySequence::Cut).toString() != QLatin1String("Ctrl+X"))
@@ -3265,6 +3283,9 @@ void tst_QLineEdit::readOnlyStyleOption()
void tst_QLineEdit::validateOnFocusOut()
{
+ if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+ QSKIP("Wayland: This fails. Figure out why.");
+
QLineEdit *testWidget = ensureTestWidget();
QSignalSpy editingFinishedSpy(testWidget, SIGNAL(editingFinished()));
testWidget->setValidator(new QIntValidator(100, 999, 0));
@@ -3369,6 +3390,9 @@ void tst_QLineEdit::leftKeyOnSelectedText()
void tst_QLineEdit::inlineCompletion()
{
+ if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+ QSKIP("Wayland: This fails. Figure out why.");
+
QLineEdit *testWidget = ensureTestWidget();
testWidget->clear();
QStandardItemModel *model = new QStandardItemModel;
@@ -3583,6 +3607,9 @@ public:
void tst_QLineEdit::task180999_focus()
{
+ if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+ QSKIP("Wayland: This fails. Figure out why.");
+
task180999_Widget widget;
widget.lineEdit1.setFocus();
@@ -3602,6 +3629,9 @@ void tst_QLineEdit::task180999_focus()
void tst_QLineEdit::task174640_editingFinished()
{
+ if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+ QSKIP("Wayland: This fails. Figure out why.");
+
QWidget mw;
QVBoxLayout *layout = new QVBoxLayout(&mw);
QLineEdit *le1 = new QLineEdit(&mw);
@@ -3703,6 +3733,9 @@ void tst_QLineEdit::task198789_currentCompletion()
void tst_QLineEdit::task210502_caseInsensitiveInlineCompletion()
{
+ if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+ QSKIP("Wayland: This fails. Figure out why.");
+
QString completion("ABCD");
QStringList completions;
completions << completion;
@@ -3800,6 +3833,9 @@ void tst_QLineEdit::task233101_cursorPosAfterInputMethod()
void tst_QLineEdit::task241436_passwordEchoOnEditRestoreEchoMode()
{
+ if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+ QSKIP("Wayland: This fails. Figure out why.");
+
QStyleOptionFrame opt;
QLineEdit *testWidget = ensureTestWidget();
QChar fillChar = testWidget->style()->styleHint(QStyle::SH_LineEdit_PasswordCharacter, &opt, testWidget);
@@ -3847,6 +3883,9 @@ void tst_QLineEdit::task248948_redoRemovedSelection()
void tst_QLineEdit::taskQTBUG_4401_enterKeyClearsPassword()
{
+ if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+ QSKIP("Wayland: This fails. Figure out why.");
+
QString password("Wanna guess?");
QLineEdit *testWidget = ensureTestWidget();
@@ -3922,6 +3961,9 @@ void tst_QLineEdit::taskQTBUG_7902_contextMenuCrash()
void tst_QLineEdit::taskQTBUG_7395_readOnlyShortcut()
{
+ if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+ QSKIP("Wayland: This fails. Figure out why.");
+
//ReadOnly QLineEdit should not intercept shortcut.
QLineEdit le;
le.setReadOnly(true);
@@ -3944,6 +3986,9 @@ void tst_QLineEdit::taskQTBUG_7395_readOnlyShortcut()
void tst_QLineEdit::QTBUG697_paletteCurrentColorGroup()
{
+ if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+ QSKIP("Wayland: This fails. Figure out why.");
+
QLineEdit le;
le.setText(" ");
QPalette p = le.palette();
@@ -3999,6 +4044,9 @@ protected:
void tst_QLineEdit::QTBUG7174_inputMaskCursorBlink()
{
+ if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+ QSKIP("Wayland: This fails. Figure out why.");
+
UpdateRegionLineEdit edit;
edit.setInputMask(QLatin1String("AAAA"));
edit.setFocus();
@@ -4169,6 +4217,9 @@ void tst_QLineEdit::selectAndCursorPosition()
void tst_QLineEdit::inputMethod()
{
+ if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+ QSKIP("Wayland: This fails. Figure out why.");
+
QLineEdit *testWidget = ensureTestWidget();
centerOnScreen(testWidget);
testWidget->show();
@@ -4275,6 +4326,9 @@ void tst_QLineEdit::inputMethodQueryImHints()
void tst_QLineEdit::inputMethodUpdate()
{
+ if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+ QSKIP("Wayland: This fails. Figure out why.");
+
QLineEdit *testWidget = ensureTestWidget();
centerOnScreen(testWidget);
@@ -4389,6 +4443,9 @@ void tst_QLineEdit::undoRedoAndEchoModes()
void tst_QLineEdit::clearButton()
{
+ if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+ QSKIP("Wayland: This fails. Figure out why.");
+
// Construct a listview with a stringlist model and filter model.
QWidget testWidget;
QVBoxLayout *l = new QVBoxLayout(&testWidget);
@@ -4443,6 +4500,9 @@ void tst_QLineEdit::clearButtonVisibleAfterSettingText_QTBUG_45518()
#ifndef QT_BUILD_INTERNAL
QSKIP("This test requires a developer build");
#else
+ if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+ QSKIP("Wayland: This fails. Figure out why.");
+
QLineEdit edit;
edit.setMinimumWidth(200);
centerOnScreen(&edit);
@@ -4671,6 +4731,9 @@ void tst_QLineEdit::shortcutOverrideOnReadonlyLineEdit_data()
void tst_QLineEdit::shortcutOverrideOnReadonlyLineEdit()
{
+ if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+ QSKIP("Wayland: This fails. Figure out why.");
+
QFETCH(QKeySequence, keySequence);
QFETCH(bool, shouldBeHandledByQLineEdit);
@@ -4844,6 +4907,9 @@ void tst_QLineEdit::testQuickSelectionWithMouse()
void tst_QLineEdit::inputRejected()
{
+ if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+ QSKIP("Wayland: This fails. Figure out why.");
+
QLineEdit *testWidget = ensureTestWidget();
QSignalSpy spyInputRejected(testWidget, SIGNAL(inputRejected()));
diff --git a/tests/auto/widgets/widgets/qmainwindow/tst_qmainwindow.cpp b/tests/auto/widgets/widgets/qmainwindow/tst_qmainwindow.cpp
index ea96322654..17eb281408 100644
--- a/tests/auto/widgets/widgets/qmainwindow/tst_qmainwindow.cpp
+++ b/tests/auto/widgets/widgets/qmainwindow/tst_qmainwindow.cpp
@@ -1741,6 +1741,9 @@ class MainWindow : public QMainWindow {
#ifndef QT_NO_CURSOR
void tst_QMainWindow::setCursor()
{
+ if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+ QSKIP("Wayland: This fails. Figure out why.");
+
MainWindow mw;
QCursor cur = Qt::WaitCursor;
mw.setCursor(cur);
@@ -1839,6 +1842,9 @@ void tst_QMainWindow::fixedSizeCentralWidget()
void tst_QMainWindow::dockWidgetSize()
{
+ if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+ QSKIP("Wayland: This fails. Figure out why.");
+
QMainWindow mainWindow;
mainWindow.menuBar()->addMenu("menu");
@@ -2055,6 +2061,9 @@ void tst_QMainWindow::resizeDocks()
#if QT_CONFIG(dockwidget) && QT_CONFIG(tabbar)
void tst_QMainWindow::QTBUG52175_tabifiedDockWidgetActivated()
{
+ if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+ QSKIP("Wayland: This fails. Figure out why.");
+
QMainWindow w;
QDockWidget *dwFirst = new QDockWidget(&w);
diff --git a/tests/auto/widgets/widgets/qmdiarea/tst_qmdiarea.cpp b/tests/auto/widgets/widgets/qmdiarea/tst_qmdiarea.cpp
index 6d38dc262f..9fe8cd8109 100644
--- a/tests/auto/widgets/widgets/qmdiarea/tst_qmdiarea.cpp
+++ b/tests/auto/widgets/widgets/qmdiarea/tst_qmdiarea.cpp
@@ -448,6 +448,9 @@ bool macHasAccessToWindowsServer()
void tst_QMdiArea::subWindowActivated2()
{
+ if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+ QSKIP("Wayland: This fails. Figure out why.");
+
QMdiArea mdiArea;
QSignalSpy spy(&mdiArea, SIGNAL(subWindowActivated(QMdiSubWindow*)));
for (int i = 0; i < 5; ++i)
@@ -966,6 +969,9 @@ void tst_QMdiArea::setActiveSubWindow()
void tst_QMdiArea::activeSubWindow()
{
+ if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+ QSKIP("Wayland: This fails. Figure out why.");
+
QMainWindow mainWindow;
QMdiArea *mdiArea = new QMdiArea;
@@ -1398,6 +1404,9 @@ void tst_QMdiArea::subWindowList_data()
}
void tst_QMdiArea::subWindowList()
{
+ if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+ QSKIP("Wayland: This fails. Figure out why.");
+
QFETCH(QMdiArea::WindowOrder, windowOrder);
QFETCH(int, windowCount);
QFETCH(int, activeSubWindow);
@@ -1569,6 +1578,9 @@ void tst_QMdiArea::setViewport()
void tst_QMdiArea::tileSubWindows()
{
+ if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+ QSKIP("Wayland: This fails. Figure out why.");
+
QMdiArea workspace;
workspace.resize(600,480);
workspace.show();
@@ -2073,6 +2085,9 @@ private:
void tst_QMdiArea::resizeTimer()
{
+ if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+ QSKIP("Wayland: This fails. Figure out why.");
+
QMdiArea mdiArea;
QMdiSubWindow *subWindow = mdiArea.addSubWindow(new QWidget);
mdiArea.show();
diff --git a/tests/auto/widgets/widgets/qmdisubwindow/tst_qmdisubwindow.cpp b/tests/auto/widgets/widgets/qmdisubwindow/tst_qmdisubwindow.cpp
index 3ee9c72209..2c5cb88ed6 100644
--- a/tests/auto/widgets/widgets/qmdisubwindow/tst_qmdisubwindow.cpp
+++ b/tests/auto/widgets/widgets/qmdisubwindow/tst_qmdisubwindow.cpp
@@ -211,6 +211,9 @@ private slots:
void tst_QMdiSubWindow::initTestCase()
{
+ if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+ QSKIP("Wayland: Almost all of these fail. Figure out why.");
+
qRegisterMetaType<Qt::WindowStates>("Qt::WindowStates");
// Avoid unnecessary waits for empty top level widget lists when
// testing menus.
diff --git a/tests/auto/widgets/widgets/qmenubar/tst_qmenubar.cpp b/tests/auto/widgets/widgets/qmenubar/tst_qmenubar.cpp
index 417d6e3124..f2d4379453 100644
--- a/tests/auto/widgets/widgets/qmenubar/tst_qmenubar.cpp
+++ b/tests/auto/widgets/widgets/qmenubar/tst_qmenubar.cpp
@@ -338,6 +338,9 @@ inline TestMenu tst_QMenuBar::initWindowWithComplexMenuBar(QMainWindow &w)
#if !defined(Q_OS_DARWIN)
void tst_QMenuBar::accel()
{
+ if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+ QSKIP("Wayland: This fails. Figure out why.");
+
// create a popup menu with menu items set the accelerators later...
QMainWindow w;
const TestMenu menu = initWindowWithSimpleMenuBar(w);
@@ -356,6 +359,9 @@ void tst_QMenuBar::accel()
#if !defined(Q_OS_DARWIN)
void tst_QMenuBar::activatedCount()
{
+ if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+ QSKIP("Wayland: This fails. Figure out why.");
+
// create a popup menu with menu items set the accelerators later...
QMainWindow w;
QFETCH( bool, forceNonNative );
@@ -555,6 +561,9 @@ void tst_QMenuBar::insertItem_QString_QObject()
#if !defined(Q_OS_DARWIN)
void tst_QMenuBar::check_accelKeys()
{
+ if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+ QSKIP("Wayland: This fails. Figure out why.");
+
QMainWindow w;
initWindowWithComplexMenuBar(w);
w.show();
@@ -631,6 +640,9 @@ void tst_QMenuBar::check_cursorKeys1()
if (qgetenv("XDG_CURRENT_DESKTOP") == "Unity")
QSKIP("This test is flaky on Ubuntu/Unity due to regression introduced by QTBUG-39362");
+ if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+ QSKIP("Wayland: This fails. Figure out why.");
+
QMainWindow w;
initWindowWithComplexMenuBar(w);
w.show();
@@ -668,6 +680,9 @@ void tst_QMenuBar::check_cursorKeys2()
if (qgetenv("XDG_CURRENT_DESKTOP") == "Unity")
QSKIP("This test is flaky on Ubuntu/Unity due to regression introduced by QTBUG-39362");
+ if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+ QSKIP("Wayland: This fails. Figure out why.");
+
QMainWindow w;
initWindowWithComplexMenuBar(w);
w.show();
@@ -704,6 +719,9 @@ void tst_QMenuBar::check_cursorKeys3()
if (qgetenv("XDG_CURRENT_DESKTOP") == "Unity")
QSKIP("This test is flaky on Ubuntu/Unity due to regression introduced by QTBUG-39362");
+ if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+ QSKIP("Wayland: This fails. Figure out why.");
+
QMainWindow w;
initWindowWithComplexMenuBar(w);
w.show();
@@ -733,6 +751,9 @@ void tst_QMenuBar::taskQTBUG56860_focus()
#if defined(Q_OS_DARWIN)
QSKIP("Native key events are needed to test menu action activation on macOS.");
#endif
+ if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+ QSKIP("Wayland: This fails. Figure out why.");
+
QMainWindow w;
QMenuBar *mb = w.menuBar();
mb->setNativeMenuBar(false);
@@ -861,6 +882,9 @@ void tst_QMenuBar::check_endKey()
#if !defined(Q_OS_DARWIN)
void tst_QMenuBar::check_escKey()
{
+ if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+ QSKIP("Wayland: This fails. Figure out why.");
+
QMainWindow w;
const TestMenu menu = initWindowWithComplexMenuBar(w);
w.show();
@@ -1051,6 +1075,9 @@ void tst_QMenuBar::allowActiveAndDisabled()
void tst_QMenuBar::check_altPress()
{
+ if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+ QSKIP("Wayland: This fails. Figure out why.");
+
if ( !qApp->style()->styleHint(QStyle::SH_MenuBar_AltKeyNavigation) ) {
QSKIP(QString( "this is not supposed to work in the %1 style. Skipping." ).
arg(qApp->style()->objectName()).toLatin1());
@@ -1071,6 +1098,9 @@ void tst_QMenuBar::check_altPress()
// should close it and QMenuBar::activeAction() should be 0.
void tst_QMenuBar::check_altClosePress()
{
+ if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+ QSKIP("Wayland: This fails. Figure out why.");
+
const QStyle *style = QApplication::style();
if (!style->styleHint(QStyle::SH_MenuBar_AltKeyNavigation) ) {
QSKIP(("This test is not supposed to work in the " + style->objectName().toLatin1()
@@ -1101,6 +1131,9 @@ void tst_QMenuBar::check_altClosePress()
#if !defined(Q_OS_DARWIN)
void tst_QMenuBar::check_shortcutPress()
{
+ if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+ QSKIP("Wayland: This fails. Figure out why.");
+
QMainWindow w;
const TestMenu menu = initWindowWithComplexMenuBar(w);
w.show();
@@ -1144,6 +1177,9 @@ private:
#if !defined(Q_OS_DARWIN)
void tst_QMenuBar::check_menuPosition()
{
+ if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+ QSKIP("Wayland: This fails. Figure out why.");
+
QMainWindow w;
Menu menu;
@@ -1266,6 +1302,9 @@ void tst_QMenuBar::task256322_highlight()
if (!QGuiApplication::platformName().compare(QLatin1String("minimal"), Qt::CaseInsensitive))
QSKIP("Highlighting does not work correctly for minimal platform");
+ if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+ QSKIP("Wayland: This fails. Figure out why.");
+
QMainWindow win;
win.menuBar()->setNativeMenuBar(false); //we can't check the geometry of native menubars
QMenu menu;
@@ -1406,6 +1445,9 @@ void tst_QMenuBar::taskQTBUG4965_escapeEaten()
void tst_QMenuBar::taskQTBUG11823_crashwithInvisibleActions()
{
+ if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+ QSKIP("Wayland: This fails. Figure out why.");
+
QMenuBar menubar;
menubar.setNativeMenuBar(false); //we can't check the geometry of native menubars
@@ -1434,6 +1476,9 @@ void tst_QMenuBar::taskQTBUG11823_crashwithInvisibleActions()
void tst_QMenuBar::closeOnSecondClickAndOpenOnThirdClick() // QTBUG-32807, menu should close on 2nd click.
{
+ if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+ QSKIP("Wayland: This fails. Figure out why.");
+
QMainWindow mainWindow;
mainWindow.resize(300, 200);
centerOnScreen(&mainWindow);
@@ -1689,6 +1734,9 @@ void tst_QMenuBar::slotForTaskQTBUG53205()
#if !defined(Q_OS_DARWIN)
void tst_QMenuBar::taskQTBUG46812_doNotLeaveMenubarHighlighted()
{
+ if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+ QSKIP("Wayland: This fails. Figure out why.");
+
QMainWindow mainWindow;
QWidget *centralWidget = new QWidget;
centralWidget->setFocusPolicy(Qt::StrongFocus);
@@ -1769,6 +1817,9 @@ void tst_QMenuBar::QTBUG_57404_existingMenuItemException()
void tst_QMenuBar::taskQTBUG55966_subMenuRemoved()
{
+ if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+ QSKIP("Wayland: This fails. Figure out why.");
+
QMainWindow window;
QMenuBar *menubar = window.menuBar();
QMenu *parentMenu = menubar->addMenu("Parent menu");
diff --git a/tests/auto/widgets/widgets/qopenglwidget/tst_qopenglwidget.cpp b/tests/auto/widgets/widgets/qopenglwidget/tst_qopenglwidget.cpp
index 76f8ebc804..17a5fe2cd9 100644
--- a/tests/auto/widgets/widgets/qopenglwidget/tst_qopenglwidget.cpp
+++ b/tests/auto/widgets/widgets/qopenglwidget/tst_qopenglwidget.cpp
@@ -388,6 +388,9 @@ public:
void tst_QOpenGLWidget::requestUpdate()
{
+ if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+ QSKIP("Wayland: This fails. Figure out why.");
+
PaintCountWidget w;
w.resize(640, 480);
w.show();
@@ -580,6 +583,9 @@ void tst_QOpenGLWidget::stackWidgetOpaqueChildIsVisible()
QSKIP("QScreen::grabWindow() doesn't work properly on OSX HighDPI screen: QTBUG-46803");
return;
#endif
+ if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+ QSKIP("Wayland: This fails. Figure out why.");
+
QStackedWidget stack;
diff --git a/tests/auto/widgets/widgets/qplaintextedit/tst_qplaintextedit.cpp b/tests/auto/widgets/widgets/qplaintextedit/tst_qplaintextedit.cpp
index 2ce75620cf..336b6ebfd5 100644
--- a/tests/auto/widgets/widgets/qplaintextedit/tst_qplaintextedit.cpp
+++ b/tests/auto/widgets/widgets/qplaintextedit/tst_qplaintextedit.cpp
@@ -284,6 +284,10 @@ void tst_QPlainTextEdit::clearMustNotChangeClipboard()
{
if (!PlatformClipboard::isAvailable())
QSKIP("Clipboard not working with cron-started unit tests");
+
+ if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+ QSKIP("Wayland: This fails. Figure out why.");
+
ed->textCursor().insertText("Hello World");
QString txt("This is different text");
QApplication::clipboard()->setText(txt);
@@ -462,6 +466,9 @@ void tst_QPlainTextEdit::undoAvailableAfterPaste()
if (!PlatformClipboard::isAvailable())
QSKIP("Clipboard not working with cron-started unit tests");
+ if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+ QSKIP("Wayland: This fails. Figure out why.");
+
QSignalSpy spy(ed->document(), SIGNAL(undoAvailable(bool)));
const QString txt("Test");
@@ -655,6 +662,9 @@ void tst_QPlainTextEdit::copyAndSelectAllInReadonly()
if (!PlatformClipboard::isAvailable())
QSKIP("Clipboard not working with cron-started unit tests");
+ if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+ QSKIP("Wayland: This fails. Figure out why.");
+
ed->setReadOnly(true);
ed->setPlainText("Hello World");
@@ -1203,6 +1213,9 @@ void tst_QPlainTextEdit::canPaste()
if (!PlatformClipboard::isAvailable())
QSKIP("Clipboard not working with cron-started unit tests");
+ if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+ QSKIP("Wayland: This fails. Figure out why.");
+
QApplication::clipboard()->setText(QString());
QVERIFY(!ed->canPaste());
QApplication::clipboard()->setText("Test");
diff --git a/tests/auto/widgets/widgets/qprogressbar/tst_qprogressbar.cpp b/tests/auto/widgets/widgets/qprogressbar/tst_qprogressbar.cpp
index f2f9cfc009..c491bbb4f6 100644
--- a/tests/auto/widgets/widgets/qprogressbar/tst_qprogressbar.cpp
+++ b/tests/auto/widgets/widgets/qprogressbar/tst_qprogressbar.cpp
@@ -239,6 +239,9 @@ void tst_QProgressBar::setValueRepaint()
#ifndef Q_OS_MAC
void tst_QProgressBar::setMinMaxRepaint()
{
+ if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+ QSKIP("Wayland: This fails. Figure out why.");
+
ProgressBar pbar;
pbar.setMinimum(0);
pbar.setMaximum(10);
diff --git a/tests/auto/widgets/widgets/qpushbutton/tst_qpushbutton.cpp b/tests/auto/widgets/widgets/qpushbutton/tst_qpushbutton.cpp
index 66f4df4498..6f4838be7a 100644
--- a/tests/auto/widgets/widgets/qpushbutton/tst_qpushbutton.cpp
+++ b/tests/auto/widgets/widgets/qpushbutton/tst_qpushbutton.cpp
@@ -325,6 +325,9 @@ void tst_QPushButton::toggled()
void tst_QPushButton::setAccel()
{
+ if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+ QSKIP("Wayland: This fails. Figure out why.");
+
testWidget->setText("&AccelTest");
QKeySequence seq( Qt::ALT + Qt::Key_A );
testWidget->setShortcut( seq );
diff --git a/tests/auto/widgets/widgets/qradiobutton/tst_qradiobutton.cpp b/tests/auto/widgets/widgets/qradiobutton/tst_qradiobutton.cpp
index a4edea23bc..7123acfdc3 100644
--- a/tests/auto/widgets/widgets/qradiobutton/tst_qradiobutton.cpp
+++ b/tests/auto/widgets/widgets/qradiobutton/tst_qradiobutton.cpp
@@ -52,6 +52,9 @@ private:
void tst_QRadioButton::task190739_focus()
{
+ if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+ QSKIP("Wayland: This fails. Figure out why.");
+
QWidget widget;
QPushButton button1(&widget);
button1.setText("button1");
diff --git a/tests/auto/widgets/widgets/qspinbox/tst_qspinbox.cpp b/tests/auto/widgets/widgets/qspinbox/tst_qspinbox.cpp
index d75e701d1c..30c57c73e5 100644
--- a/tests/auto/widgets/widgets/qspinbox/tst_qspinbox.cpp
+++ b/tests/auto/widgets/widgets/qspinbox/tst_qspinbox.cpp
@@ -906,6 +906,9 @@ void tst_QSpinBox::locale()
void tst_QSpinBox::editingFinished()
{
+ if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+ QSKIP("Wayland: This fails. Figure out why.");
+
QWidget testFocusWidget;
testFocusWidget.setObjectName(QLatin1String("tst_qspinbox"));
testFocusWidget.setWindowTitle(objectName());
@@ -1075,6 +1078,9 @@ void tst_QSpinBox::undoRedo()
void tst_QSpinBox::specialValue()
{
+ if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+ QSKIP("Wayland: This fails. Figure out why.");
+
QString specialText="foo";
QWidget topWidget;
@@ -1167,6 +1173,9 @@ void tst_QSpinBox::sizeHint()
void tst_QSpinBox::taskQTBUG_5008_textFromValueAndValidate()
{
+ if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+ QSKIP("Wayland: This fails. Figure out why.");
+
class DecoratedSpinBox : public QSpinBox
{
public:
@@ -1245,6 +1254,9 @@ void tst_QSpinBox::lineEditReturnPressed()
void tst_QSpinBox::positiveSign()
{
+ if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+ QSKIP("Wayland: This fails. Figure out why.");
+
QSpinBox spinBox;
spinBox.setRange(-20, 20);
spinBox.setValue(-20);
@@ -1260,6 +1272,9 @@ void tst_QSpinBox::positiveSign()
void tst_QSpinBox::interpretOnLosingFocus()
{
+ if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+ QSKIP("Wayland: This fails. Figure out why.");
+
// QTBUG-55249: When typing an invalid value after QSpinBox::clear(),
// it should be fixed up on losing focus.
@@ -1614,6 +1629,9 @@ void tst_QSpinBox::stepModifierKeys_data()
void tst_QSpinBox::stepModifierKeys()
{
+ if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+ QSKIP("Wayland: This fails. Figure out why.");
+
QFETCH(int, startValue);
QFETCH(int, stepModifier);
QFETCH(QTestEventList, keys);
@@ -1697,6 +1715,9 @@ void tst_QSpinBox::stepModifierButtons_data()
void tst_QSpinBox::stepModifierButtons()
{
+ if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+ QSKIP("Wayland: This fails. Figure out why.");
+
QFETCH(QStyle::SubControl, subControl);
QFETCH(int, stepModifier);
QFETCH(Qt::KeyboardModifiers, modifiers);
@@ -1782,6 +1803,9 @@ void tst_QSpinBox::stepModifierPressAndHold_data()
void tst_QSpinBox::stepModifierPressAndHold()
{
+ if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+ QSKIP("Wayland: This fails. Figure out why.");
+
QFETCH(QStyle::SubControl, subControl);
QFETCH(int, stepModifier);
QFETCH(Qt::KeyboardModifiers, modifiers);
diff --git a/tests/auto/widgets/widgets/qsplitter/tst_qsplitter.cpp b/tests/auto/widgets/widgets/qsplitter/tst_qsplitter.cpp
index cbeb77a25e..cc65accdc3 100644
--- a/tests/auto/widgets/widgets/qsplitter/tst_qsplitter.cpp
+++ b/tests/auto/widgets/widgets/qsplitter/tst_qsplitter.cpp
@@ -278,6 +278,9 @@ void tst_QSplitter::saveAndRestoreState()
void tst_QSplitter::saveAndRestoreStateOfNotYetShownSplitter()
{
+ if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+ QSKIP("Wayland: This fails. Figure out why.");
+
QSplitter *spl = new QSplitter;
QLabel *l1 = new QLabel;
QLabel *l2 = new QLabel;
@@ -590,6 +593,9 @@ void tst_QSplitter::testShowHide_data()
void tst_QSplitter::testShowHide()
{
+ if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+ QSKIP("Wayland: This fails. Figure out why.");
+
QFETCH(bool, hideWidget1);
QFETCH(bool, hideWidget2);
@@ -716,6 +722,9 @@ void tst_QSplitter::replaceWidget_data()
void tst_QSplitter::replaceWidget()
{
+ if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+ QSKIP("Wayland: This fails. Figure out why.");
+
QFETCH(int, index);
QFETCH(bool, visible);
QFETCH(bool, collapsed);
@@ -962,6 +971,9 @@ class MyTextEdit : public QTextEdit
void tst_QSplitter::task169702_sizes()
{
+ if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+ QSKIP("Wayland: This fails. Figure out why.");
+
QWidget topLevel;
// Create two nested (non-collapsible) splitters
QSplitter* outerSplitter = new QSplitter(Qt::Vertical, &topLevel);
diff --git a/tests/auto/widgets/widgets/qstackedwidget/tst_qstackedwidget.cpp b/tests/auto/widgets/widgets/qstackedwidget/tst_qstackedwidget.cpp
index 59a334fab9..4fd3661fa7 100644
--- a/tests/auto/widgets/widgets/qstackedwidget/tst_qstackedwidget.cpp
+++ b/tests/auto/widgets/widgets/qstackedwidget/tst_qstackedwidget.cpp
@@ -163,6 +163,9 @@ private:
void tst_QStackedWidget::dynamicPages()
{
+ if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+ QSKIP("Wayland: This fails. Figure out why.");
+
QStackedWidget stackedWidget;
QStackedWidget *sw = &stackedWidget;
diff --git a/tests/auto/widgets/widgets/qstatusbar/tst_qstatusbar.cpp b/tests/auto/widgets/widgets/qstatusbar/tst_qstatusbar.cpp
index 928910344c..256906080e 100644
--- a/tests/auto/widgets/widgets/qstatusbar/tst_qstatusbar.cpp
+++ b/tests/auto/widgets/widgets/qstatusbar/tst_qstatusbar.cpp
@@ -132,6 +132,9 @@ void tst_QStatusBar::insertPermanentWidget()
void tst_QStatusBar::setSizeGripEnabled()
{
+ if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+ QSKIP("Wayland: This fails. Figure out why.");
+
QMainWindow mainWindow;
QPointer<QStatusBar> statusBar = mainWindow.statusBar();
QVERIFY(statusBar);
@@ -223,6 +226,9 @@ void tst_QStatusBar::task194017_hiddenWidget()
void tst_QStatusBar::QTBUG4334_hiddenOnMaximizedWindow()
{
+ if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+ QSKIP("Wayland: This fails. Figure out why.");
+
QMainWindow main;
QStatusBar statusbar;
statusbar.setSizeGripEnabled(true);
diff --git a/tests/auto/widgets/widgets/qtabwidget/tst_qtabwidget.cpp b/tests/auto/widgets/widgets/qtabwidget/tst_qtabwidget.cpp
index feade7d443..a37042aeca 100644
--- a/tests/auto/widgets/widgets/qtabwidget/tst_qtabwidget.cpp
+++ b/tests/auto/widgets/widgets/qtabwidget/tst_qtabwidget.cpp
@@ -536,6 +536,9 @@ protected:
void tst_QTabWidget::paintEventCount()
{
+ if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+ QSKIP("Wayland: This fails. Figure out why.");
+
Q_CHECK_PAINTEVENTS
PaintCounter *tab1 = new PaintCounter;
diff --git a/tests/auto/widgets/widgets/qtextbrowser/tst_qtextbrowser.cpp b/tests/auto/widgets/widgets/qtextbrowser/tst_qtextbrowser.cpp
index 27bf0ce7be..2496d446d8 100644
--- a/tests/auto/widgets/widgets/qtextbrowser/tst_qtextbrowser.cpp
+++ b/tests/auto/widgets/widgets/qtextbrowser/tst_qtextbrowser.cpp
@@ -70,6 +70,7 @@ class tst_QTextBrowser : public QObject
Q_OBJECT
private slots:
+ void initTestCase();
void init();
void cleanup();
@@ -101,6 +102,12 @@ private:
TestBrowser *browser;
};
+void tst_QTextBrowser::initTestCase()
+{
+ if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+ QSKIP("Wayland: This fails. Figure out why.");
+}
+
void tst_QTextBrowser::init()
{
QString prefix = QFileInfo(QFINDTESTDATA("subdir")).absolutePath();
diff --git a/tests/auto/widgets/widgets/qtextedit/tst_qtextedit.cpp b/tests/auto/widgets/widgets/qtextedit/tst_qtextedit.cpp
index b31e230893..cfd8132d46 100644
--- a/tests/auto/widgets/widgets/qtextedit/tst_qtextedit.cpp
+++ b/tests/auto/widgets/widgets/qtextedit/tst_qtextedit.cpp
@@ -500,6 +500,10 @@ void tst_QTextEdit::clearMustNotChangeClipboard()
{
if (!PlatformClipboard::isAvailable())
QSKIP("Clipboard not working with cron-started unit tests");
+
+ if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+ QSKIP("Wayland: This fails. Figure out why.");
+
ed->textCursor().insertText("Hello World");
QString txt("This is different text");
QApplication::clipboard()->setText(txt);
@@ -790,6 +794,9 @@ void tst_QTextEdit::undoAvailableAfterPaste()
if (!PlatformClipboard::isAvailable())
QSKIP("Clipboard not working with cron-started unit tests");
+ if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+ QSKIP("Wayland: This fails. Figure out why.");
+
QSignalSpy spy(ed->document(), SIGNAL(undoAvailable(bool)));
const QString txt("Test");
@@ -1012,6 +1019,9 @@ void tst_QTextEdit::copyAndSelectAllInReadonly()
if (!PlatformClipboard::isAvailable())
QSKIP("Clipboard not working with cron-started unit tests");
+ if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+ QSKIP("Wayland: This fails. Figure out why.");
+
ed->setReadOnly(true);
ed->setPlainText("Hello World");
@@ -1559,6 +1569,9 @@ void tst_QTextEdit::canPaste()
if (!PlatformClipboard::isAvailable())
QSKIP("Clipboard not working with cron-started unit tests");
+ if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+ QSKIP("Wayland: This fails. Figure out why.");
+
QApplication::clipboard()->setText(QString());
QVERIFY(!ed->canPaste());
QApplication::clipboard()->setText("Test");
@@ -1864,6 +1877,9 @@ void tst_QTextEdit::copyPasteBackgroundImage()
if (!PlatformClipboard::isAvailable())
QSKIP("Native clipboard not working in this setup");
+ if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+ QSKIP("Wayland: This fails. Figure out why.");
+
QImage foo(16, 16, QImage::Format_ARGB32_Premultiplied);
foo.save("foo.png");
ed->setHtml("<body><table><tr><td background=\"foo.png\">Foo</td></tr></table></body>");
@@ -2440,6 +2456,9 @@ void tst_QTextEdit::bidiLogicalMovement()
void tst_QTextEdit::inputMethodEvent()
{
+ if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+ QSKIP("Wayland: This fails. Figure out why.");
+
ed->show();
// test that text change with an input method event triggers change signal
@@ -2543,6 +2562,9 @@ void tst_QTextEdit::inputMethodCursorRect()
void tst_QTextEdit::highlightLongLine()
{
+ if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+ QSKIP("Wayland: This fails. Figure out why.");
+
QTextEdit edit;
edit.setAcceptRichText(false);
edit.setWordWrapMode(QTextOption::NoWrap);
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);
diff --git a/tests/auto/widgets/widgets/qtoolbutton/tst_qtoolbutton.cpp b/tests/auto/widgets/widgets/qtoolbutton/tst_qtoolbutton.cpp
index 44b30fa794..32a86993df 100644
--- a/tests/auto/widgets/widgets/qtoolbutton/tst_qtoolbutton.cpp
+++ b/tests/auto/widgets/widgets/qtoolbutton/tst_qtoolbutton.cpp
@@ -110,6 +110,9 @@ void tst_QToolButton::getSetCheck()
void tst_QToolButton::triggered()
{
+ if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+ QSKIP("Wayland: This fails. Figure out why.");
+
qRegisterMetaType<QAction *>("QAction *");
QWidget mainWidget;
mainWidget.setWindowTitle(QStringLiteral("triggered"));
@@ -193,6 +196,9 @@ void tst_QToolButton::task230994_iconSize()
void tst_QToolButton::task176137_autoRepeatOfAction()
{
+ if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+ QSKIP("Wayland: This fails. Figure out why.");
+
QAction action(0);
QWidget mainWidget;
mainWidget.setWindowTitle(QStringLiteral("task176137_autoRepeatOfAction"));