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

 Conflicts:
	.qmake.conf
	qmake/generators/makefile.cpp

Change-Id: Ifb2633a69d0bf8cdf12d799c6259beefc279c49e

1 files changed, 6 insertions, 0 deletions

diff --git a/tests/auto/widgets/graphicsview/qgraphicsitem/tst_qgraphicsitem.cpp b/tests/auto/widgets/graphicsview/qgraphicsitem/tst_qgraphicsitem.cpp
index 0cfdecbcab..4f3ff15ae0 100644
--- a/tests/auto/widgets/graphicsview/qgraphicsitem/tst_qgraphicsitem.cpp
+++ b/tests/auto/widgets/graphicsview/qgraphicsitem/tst_qgraphicsitem.cpp
@@ -5055,6 +5055,12 @@ public:
 
 void tst_QGraphicsItem::paint()
 {
+#if defined(Q_OS_MACOS)
+    if (QSysInfo::productVersion() == QLatin1String("10.12")) {
+        QSKIP("Test is very flaky on MacOS_10_12, see QTBUG-76566");
+    }
+#endif
+
     QGraphicsScene scene;
 
     PaintTester paintTester;