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

Change-Id: Ifecc2d9db396d783124df8567553ba5f846f30bb

1 files changed, 15 insertions, 2 deletions

diff --git a/tests/auto/widgets/graphicsview/qgraphicsscene/tst_qgraphicsscene.cpp b/tests/auto/widgets/graphicsview/qgraphicsscene/tst_qgraphicsscene.cpp
index 950f3ef670..cfbe1f96ee 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;
@@ -3738,8 +3747,6 @@ void tst_QGraphicsScene::changedSignal()
     QCoreApplication::processEvents();
     QCOMPARE(cl.changes.size(), 2);
     QCOMPARE(cl.changes.at(1).size(), 2);
-    QCOMPARE(cl.changes.at(1).first(), QRectF(0, 0, 10, 10));
-    QCOMPARE(cl.changes.at(1).last(), QRectF(20, 0, 10, 10));
 
     QCOMPARE(scene.sceneRect(), QRectF(0, 0, 30, 10));
 }
@@ -3811,6 +3818,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 +4064,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