Merge remote-tracking branch 'origin/dev' into wip/cmake

Change-Id: Ifecc2d9db396d783124df8567553ba5f846f30bb

1 files changed, 13 insertions, 0 deletions

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");