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/qopenglwidget/tst_qopenglwidget.cpp | |
| 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/qopenglwidget/tst_qopenglwidget.cpp')
| -rw-r--r-- | tests/auto/widgets/widgets/qopenglwidget/tst_qopenglwidget.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
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; |