Merge remote-tracking branch 'origin/5.13' into dev

 Conflicts:
	qmake/generators/makefile.cpp
	qmake/generators/unix/unixmake2.cpp
	src/corelib/thread/qthread_unix.cpp
	tests/auto/corelib/tools/qsharedpointer/tst_qsharedpointer.cpp

Change-Id: I1df0d4ba20685de7f9300bf07458c13376493408

2 files changed, 20 insertions, 19 deletions

diff --git a/tests/auto/widgets/graphicsview/qgraphicsview/BLACKLIST b/tests/auto/widgets/graphicsview/qgraphicsview/BLACKLIST
index e3d968b4f2..ee13a37212 100644
--- a/tests/auto/widgets/graphicsview/qgraphicsview/BLACKLIST
+++ b/tests/auto/widgets/graphicsview/qgraphicsview/BLACKLIST
@@ -4,6 +4,7 @@ xcb
 xcb
 [cursor2]
 xcb
+windows
 [rubberBandExtendSelection]
 xcb
 [rotated_rubberBand]
diff --git a/tests/auto/widgets/graphicsview/qgraphicsview/tst_qgraphicsview.cpp b/tests/auto/widgets/graphicsview/qgraphicsview/tst_qgraphicsview.cpp
index efee901227..6e42758122 100644
--- a/tests/auto/widgets/graphicsview/qgraphicsview/tst_qgraphicsview.cpp
+++ b/tests/auto/widgets/graphicsview/qgraphicsview/tst_qgraphicsview.cpp
@@ -2280,53 +2280,53 @@ void tst_QGraphicsView::cursor2()
     QVERIFY(QTest::qWaitForWindowExposed(&view));
 
     sendMouseMove(view.viewport(), view.mapFromScene(-30, -30));
-    QCOMPARE(view.viewport()->cursor().shape(), Qt::PointingHandCursor);
+    QTRY_COMPARE(view.viewport()->cursor().shape(), Qt::PointingHandCursor);
     sendMouseMove(view.viewport(), view.mapFromScene(0, 0));
-    QCOMPARE(view.viewport()->cursor().shape(), Qt::IBeamCursor);
+    QTRY_COMPARE(view.viewport()->cursor().shape(), Qt::IBeamCursor);
     sendMouseMove(view.viewport(), view.mapFromScene(-30, -30));
-    QCOMPARE(view.viewport()->cursor().shape(), Qt::PointingHandCursor);
+    QTRY_COMPARE(view.viewport()->cursor().shape(), Qt::PointingHandCursor);
     sendMouseMove(view.viewport(), view.mapFromScene(0, 0));
-    QCOMPARE(view.viewport()->cursor().shape(), Qt::IBeamCursor);
+    QTRY_COMPARE(view.viewport()->cursor().shape(), Qt::IBeamCursor);
     sendMouseMove(view.viewport(), view.mapFromScene(-15, 0));
-    QCOMPARE(view.viewport()->cursor().shape(), Qt::PointingHandCursor);
+    QTRY_COMPARE(view.viewport()->cursor().shape(), Qt::PointingHandCursor);
 
     view.setDragMode(QGraphicsView::ScrollHandDrag);
 
     sendMouseMove(view.viewport(), view.mapFromScene(-30, -30));
-    QCOMPARE(view.viewport()->cursor().shape(), Qt::OpenHandCursor);
+    QTRY_COMPARE(view.viewport()->cursor().shape(), Qt::OpenHandCursor);
     sendMouseMove(view.viewport(), view.mapFromScene(0, 0));
-    QCOMPARE(view.viewport()->cursor().shape(), Qt::IBeamCursor);
+    QTRY_COMPARE(view.viewport()->cursor().shape(), Qt::IBeamCursor);
     sendMouseMove(view.viewport(), view.mapFromScene(-15, -15));
-    QCOMPARE(view.viewport()->cursor().shape(), Qt::OpenHandCursor);
+    QTRY_COMPARE(view.viewport()->cursor().shape(), Qt::OpenHandCursor);
 
     view.setDragMode(QGraphicsView::NoDrag);
-    QCOMPARE(view.viewport()->cursor().shape(), Qt::ArrowCursor);
+    QTRY_COMPARE(view.viewport()->cursor().shape(), Qt::ArrowCursor);
     view.viewport()->setCursor(Qt::PointingHandCursor);
-    QCOMPARE(view.viewport()->cursor().shape(), Qt::PointingHandCursor);
+    QTRY_COMPARE(view.viewport()->cursor().shape(), Qt::PointingHandCursor);
 
     item2->setCursor(Qt::SizeAllCursor);
 
     sendMouseMove(view.viewport(), view.mapFromScene(-30, -30));
-    QCOMPARE(view.viewport()->cursor().shape(), Qt::PointingHandCursor);
+    QTRY_COMPARE(view.viewport()->cursor().shape(), Qt::PointingHandCursor);
     sendMouseMove(view.viewport(), view.mapFromScene(-15, -15));
-    QCOMPARE(view.viewport()->cursor().shape(), Qt::SizeAllCursor);
+    QTRY_COMPARE(view.viewport()->cursor().shape(), Qt::SizeAllCursor);
     sendMouseMove(view.viewport(), view.mapFromScene(0, 0));
-    QCOMPARE(view.viewport()->cursor().shape(), Qt::IBeamCursor);
+    QTRY_COMPARE(view.viewport()->cursor().shape(), Qt::IBeamCursor);
     sendMouseMove(view.viewport(), view.mapFromScene(-15, -15));
-    QCOMPARE(view.viewport()->cursor().shape(), Qt::SizeAllCursor);
+    QTRY_COMPARE(view.viewport()->cursor().shape(), Qt::SizeAllCursor);
     sendMouseMove(view.viewport(), view.mapFromScene(0, 0));
-    QCOMPARE(view.viewport()->cursor().shape(), Qt::IBeamCursor);
+    QTRY_COMPARE(view.viewport()->cursor().shape(), Qt::IBeamCursor);
     sendMouseMove(view.viewport(), view.mapFromScene(-30, -30));
-    QCOMPARE(view.viewport()->cursor().shape(), Qt::PointingHandCursor);
+    QTRY_COMPARE(view.viewport()->cursor().shape(), Qt::PointingHandCursor);
 
     view.setDragMode(QGraphicsView::ScrollHandDrag);
 
     sendMouseMove(view.viewport(), view.mapFromScene(-30, -30));
-    QCOMPARE(view.viewport()->cursor().shape(), Qt::OpenHandCursor);
+    QTRY_COMPARE(view.viewport()->cursor().shape(), Qt::OpenHandCursor);
     sendMouseMove(view.viewport(), view.mapFromScene(0, 0));
-    QCOMPARE(view.viewport()->cursor().shape(), Qt::IBeamCursor);
+    QTRY_COMPARE(view.viewport()->cursor().shape(), Qt::IBeamCursor);
     sendMouseMove(view.viewport(), view.mapFromScene(-15, -15));
-    QCOMPARE(view.viewport()->cursor().shape(), Qt::SizeAllCursor);
+    QTRY_COMPARE(view.viewport()->cursor().shape(), Qt::SizeAllCursor);
 }
 #endif