Merge remote-tracking branch 'origin/5.14' into 5.15

Change-Id: I8dbcf23835d52d3aa7d018ed250814d60c68aa83

5 files changed, 16 insertions, 3 deletions

diff --git a/tests/auto/widgets/itemviews/qtableview/BLACKLIST b/tests/auto/widgets/itemviews/qtableview/BLACKLIST
index 9648cef3de..ff870915be 100644
--- a/tests/auto/widgets/itemviews/qtableview/BLACKLIST
+++ b/tests/auto/widgets/itemviews/qtableview/BLACKLIST
@@ -1,3 +1,5 @@
 [moveCursorBiggerJump]
 osx
+[mouseWheel:scroll down per pixel]
+macos
 
diff --git a/tests/auto/widgets/kernel/qwidget/BLACKLIST b/tests/auto/widgets/kernel/qwidget/BLACKLIST
index 26f9ce1b85..be19d8fd0b 100644
--- a/tests/auto/widgets/kernel/qwidget/BLACKLIST
+++ b/tests/auto/widgets/kernel/qwidget/BLACKLIST
@@ -22,7 +22,7 @@ opensuse-leap
 # QTBUG-68175
 opensuse-42.3
 [childEvents]
-osx ci
+macos
 [renderInvisible]
 osx-10.12
 osx-10.11
@@ -34,8 +34,7 @@ osx
 [render_systemClip]
 osx
 [showMinimizedKeepsFocus]
-osx-10.12 ci
-osx-10.13 ci
+macos
 [maskedUpdate]
 opensuse
 opensuse-leap
@@ -49,3 +48,7 @@ ubuntu
 # QTBUG-75270
 winrt
 
+[syntheticEnterLeave]
+macos # Can't move cursor (QTBUG-76312)
+[taskQTBUG_4055_sendSyntheticEnterLeave]
+macos # Can't move cursor (QTBUG-76312)
diff --git a/tests/auto/widgets/styles/qstylesheetstyle/BLACKLIST b/tests/auto/widgets/styles/qstylesheetstyle/BLACKLIST
index 6b2e4f3fb2..616cd650b3 100644
--- a/tests/auto/widgets/styles/qstylesheetstyle/BLACKLIST
+++ b/tests/auto/widgets/styles/qstylesheetstyle/BLACKLIST
@@ -1,2 +1,4 @@
 [task232085_spinBoxLineEditBg]
 osx
+[widgetStylePropagation]
+macos # QTBUG-75786
diff --git a/tests/auto/widgets/widgets/qmenu/BLACKLIST b/tests/auto/widgets/widgets/qmenu/BLACKLIST
index ad6d2f340c..ba9c184a67 100644
--- a/tests/auto/widgets/widgets/qmenu/BLACKLIST
+++ b/tests/auto/widgets/widgets/qmenu/BLACKLIST
@@ -11,3 +11,5 @@ osx-10.13
 osx-10.14
 [activeSubMenuPosition]
 winrt
+[submenuTearOffDontClose]
+macos # Can't move cursor (QTBUG-76312)
diff --git a/tests/auto/widgets/widgets/qmenu/tst_qmenu.cpp b/tests/auto/widgets/widgets/qmenu/tst_qmenu.cpp
index 1e20b7598f..3dc7b05af9 100644
--- a/tests/auto/widgets/widgets/qmenu/tst_qmenu.cpp
+++ b/tests/auto/widgets/widgets/qmenu/tst_qmenu.cpp
@@ -1066,6 +1066,10 @@ static inline QByteArray msgGeometryIntersects(const QRect &r1, const QRect &r2)
 
 void tst_QMenu::pushButtonPopulateOnAboutToShow()
 {
+#ifdef Q_OS_MACOS
+    QSKIP("Popup menus may partially overlap the button on macOS, and that's okey");
+#endif
+
     QPushButton b("Test PushButton");
     b.setWindowFlags(Qt::FramelessWindowHint | Qt::X11BypassWindowManagerHint);