5 files changed, 14 insertions, 24 deletions
diff --git a/tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp b/tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp
index ea1b330152..3878e7ccb2 100644
--- a/tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp
+++ b/tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp
@@ -2756,10 +2756,7 @@ void tst_QComboBox::resetModel()
     class StringListModel : public QStringListModel
     {
     public:
-        StringListModel(const QStringList &list) : QStringListModel(list)
-        {
-        }
-
+        using QStringListModel::QStringListModel;
         void reset()
         {
             QStringListModel::beginResetModel();
@@ -2767,8 +2764,8 @@ void tst_QComboBox::resetModel()
         }
     };
     QComboBox cb;
-    StringListModel model( QStringList() << "1" << "2");
-    QSignalSpy spy(&cb, SIGNAL(currentIndexChanged(int)));
+    StringListModel model({"1", "2"});
+    QSignalSpy spy(&cb, QOverload<int>::of(&QComboBox::currentIndexChanged));
     QCOMPARE(spy.count(), 0);
     QCOMPARE(cb.currentIndex(), -1); //no selection
 
@@ -2779,7 +2776,7 @@ void tst_QComboBox::resetModel()
 
     model.reset();
     QCOMPARE(spy.count(), 2);
-    QCOMPARE(cb.currentIndex(), -1); //no selection
+    QCOMPARE(cb.currentIndex(), 0); //first item selected
 
 }
 
diff --git a/tests/auto/widgets/widgets/qdoublespinbox/BLACKLIST b/tests/auto/widgets/widgets/qdoublespinbox/BLACKLIST
index 8f5648d0f9..9da179e365 100644
--- a/tests/auto/widgets/widgets/qdoublespinbox/BLACKLIST
+++ b/tests/auto/widgets/widgets/qdoublespinbox/BLACKLIST
@@ -1,4 +1,2 @@
 [editingFinished]
-osx-10.12
-osx-10.14
-osx-10.13
+macos
diff --git a/tests/auto/widgets/widgets/qmdiarea/BLACKLIST b/tests/auto/widgets/widgets/qmdiarea/BLACKLIST
index 1dd876ea97..6010772be7 100644
--- a/tests/auto/widgets/widgets/qmdiarea/BLACKLIST
+++ b/tests/auto/widgets/widgets/qmdiarea/BLACKLIST
@@ -2,15 +2,12 @@
 ubuntu-16.04
 rhel-7.6
 opensuse-leap
-osx-10.11
-osx-10.13
+macos
 ubuntu-18.04
-osx-10.14
+macos
 rhel-7.4
-osx-10.12
+macos
 opensuse-42.3
 [resizeTimer]
-osx-10.12
-osx-10.14
-osx-10.13
+macos
 
diff --git a/tests/auto/widgets/widgets/qmenu/BLACKLIST b/tests/auto/widgets/widgets/qmenu/BLACKLIST
index ba9c184a67..5677172f8e 100644
--- a/tests/auto/widgets/widgets/qmenu/BLACKLIST
+++ b/tests/auto/widgets/widgets/qmenu/BLACKLIST
@@ -1,14 +1,12 @@
 [task258920_mouseBorder]
-osx-10.14
-osx-10.13
+macos
 [layoutDirection]
-osx-10.12
-osx-10.13
+macos
 # Fails when enabling synchronous expose events QTBUG-62092
 [pushButtonPopulateOnAboutToShow]
-osx-10.13
+macos
 [tearOff]
-osx-10.14
+macos
 [activeSubMenuPosition]
 winrt
 [submenuTearOffDontClose]
diff --git a/tests/auto/widgets/widgets/qtoolbutton/BLACKLIST b/tests/auto/widgets/widgets/qtoolbutton/BLACKLIST
index 52ba36562f..315e179d0a 100644
--- a/tests/auto/widgets/widgets/qtoolbutton/BLACKLIST
+++ b/tests/auto/widgets/widgets/qtoolbutton/BLACKLIST
@@ -1,2 +1,2 @@
 [task176137_autoRepeatOfAction]
-osx-10.13
+macos