diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-10-19 01:01:02 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-10-19 01:01:03 +0200 |
| commit | ab5153aa0b09320dc5c96aa2b5a564ea1e6dbed3 (patch) | |
| tree | bbb46d30b7a0b6122a8da1fba7cf8ac2a4b835a7 /tests/auto/widgets/widgets/qmainwindow | |
| parent | 56e5e06ff2f3a2230bb7780c73c85b73f9aaa4f8 (diff) | |
| parent | 52484cc4b6696c8a5c1f69125d81eb0cede8cdb2 (diff) | |
Merge remote-tracking branch 'origin/5.15' into dev
Change-Id: I5b671c89ceb8998b37f99d58df0e0a9e5785e3ad
Diffstat (limited to 'tests/auto/widgets/widgets/qmainwindow')
| -rw-r--r-- | tests/auto/widgets/widgets/qmainwindow/tst_qmainwindow.cpp | 9 |
1 files changed, 9 insertions, 0 deletions
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); |