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

Change-Id: Ifecc2d9db396d783124df8567553ba5f846f30bb

1 files changed, 17 insertions, 0 deletions

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