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

Change-Id: Ib719a6249069e6bd6c9311bbec7f364855ab82ff

52 files changed, 544 insertions, 390 deletions

diff --git a/tests/auto/widgets/dialogs/qdialog/BLACKLIST b/tests/auto/widgets/dialogs/qdialog/BLACKLIST
index dd6a8bfff9..72e3dff6dd 100644
--- a/tests/auto/widgets/dialogs/qdialog/BLACKLIST
+++ b/tests/auto/widgets/dialogs/qdialog/BLACKLIST
@@ -1,4 +1,4 @@
 [snapToDefaultButton]
-osx
+osx-10.14
 [showFullScreen]
 osx-10.13 ci
diff --git a/tests/auto/widgets/dialogs/qdialog/tst_qdialog.cpp b/tests/auto/widgets/dialogs/qdialog/tst_qdialog.cpp
index c840dabc1a..a494d7119a 100644
--- a/tests/auto/widgets/dialogs/qdialog/tst_qdialog.cpp
+++ b/tests/auto/widgets/dialogs/qdialog/tst_qdialog.cpp
@@ -52,7 +52,9 @@ class DummyDialog : public QDialog
 {
 public:
     DummyDialog(): QDialog() {}
+#if QT_DEPRECATED_SINCE(5, 13)
     using QDialog::showExtension;
+#endif
 };
 
 class tst_QDialog : public QObject
@@ -64,8 +66,10 @@ public:
 private slots:
     void cleanup();
     void getSetCheck();
+#if QT_DEPRECATED_SINCE(5, 13)
     void showExtension_data();
     void showExtension();
+#endif
     void defaultButtons();
     void showMaximized();
     void showMinimized();
@@ -76,6 +80,9 @@ private slots:
     void deleteInExec();
 #if QT_CONFIG(sizegrip)
     void showSizeGrip();
+#if QT_DEPRECATED_SINCE(5, 13)
+    void showSizeGrip_deprecated();
+#endif
 #endif
     void setVisible();
     void reject();
@@ -89,6 +96,7 @@ private slots:
 void tst_QDialog::getSetCheck()
 {
     QDialog obj1;
+#if QT_DEPRECATED_SINCE(5, 13)
     // QWidget* QDialog::extension()
     // void QDialog::setExtension(QWidget*)
     QWidget *var1 = new QWidget;
@@ -97,6 +105,7 @@ void tst_QDialog::getSetCheck()
     obj1.setExtension((QWidget *)0);
     QCOMPARE((QWidget *)0, obj1.extension());
     // No delete var1, since setExtension takes ownership
+#endif
 
     // int QDialog::result()
     // void QDialog::setResult(int)
@@ -146,6 +155,7 @@ void tst_QDialog::cleanup()
     QVERIFY(QApplication::topLevelWidgets().isEmpty());
 }
 
+#if QT_DEPRECATED_SINCE(5, 13)
 void tst_QDialog::showExtension_data()
 {
     QTest::addColumn<QSize>("dlgSize");
@@ -197,6 +207,7 @@ void tst_QDialog::showExtension()
 
     testWidget.setExtension( 0 );
 }
+#endif
 
 void tst_QDialog::defaultButtons()
 {
@@ -422,9 +433,37 @@ void tst_QDialog::deleteInExec()
 }
 
 #if QT_CONFIG(sizegrip)
+
 // From Task 124269
 void tst_QDialog::showSizeGrip()
 {
+    QDialog dialog(nullptr);
+    dialog.show();
+    QWidget *ext = new QWidget(&dialog);
+    QVERIFY(!dialog.isSizeGripEnabled());
+
+    dialog.setSizeGripEnabled(true);
+    QPointer<QSizeGrip> sizeGrip = dialog.findChild<QSizeGrip *>();
+    QVERIFY(sizeGrip);
+    QVERIFY(sizeGrip->isVisible());
+    QVERIFY(dialog.isSizeGripEnabled());
+
+    dialog.setSizeGripEnabled(false);
+    QVERIFY(!dialog.isSizeGripEnabled());
+
+    dialog.setSizeGripEnabled(true);
+    sizeGrip = dialog.findChild<QSizeGrip *>();
+    QVERIFY(sizeGrip);
+    QVERIFY(sizeGrip->isVisible());
+    sizeGrip->hide();
+    dialog.hide();
+    dialog.show();
+    QVERIFY(!sizeGrip->isVisible());
+}
+
+#if QT_DEPRECATED_SINCE(5, 13)
+void tst_QDialog::showSizeGrip_deprecated()
+{
     QDialog dialog(0);
     dialog.show();
     QWidget *ext = new QWidget(&dialog);
@@ -476,7 +515,9 @@ void tst_QDialog::showSizeGrip()
     dialog.show();
     QVERIFY(!sizeGrip->isVisible());
 }
-#endif
+#endif // QT_DEPRECATED_SINCE(5, 13)
+
+#endif // QT_CONFIG(sizegrip)
 
 void tst_QDialog::setVisible()
 {
diff --git a/tests/auto/widgets/dialogs/qfiledialog/tst_qfiledialog.cpp b/tests/auto/widgets/dialogs/qfiledialog/tst_qfiledialog.cpp
index f7482bae45..2131e45f29 100644
--- a/tests/auto/widgets/dialogs/qfiledialog/tst_qfiledialog.cpp
+++ b/tests/auto/widgets/dialogs/qfiledialog/tst_qfiledialog.cpp
@@ -800,7 +800,10 @@ void tst_QFiledialog::isReadOnly()
     QAction* renameAction = fd.findChild<QAction*>("qt_rename_action");
     QAction* deleteAction = fd.findChild<QAction*>("qt_delete_action");
 
+#if QT_DEPRECATED_SINCE(5, 13)
     QCOMPARE(fd.isReadOnly(), false);
+#endif
+    QCOMPARE(fd.testOption(QFileDialog::ReadOnly), false);
 
     // This is dependent upon the file/dir, find cross platform way to test
     //fd.setDirectory(QDir::home());
diff --git a/tests/auto/widgets/dialogs/qfiledialog2/BLACKLIST b/tests/auto/widgets/dialogs/qfiledialog2/BLACKLIST
index e0887d8ad1..875855b59e 100644
--- a/tests/auto/widgets/dialogs/qfiledialog2/BLACKLIST
+++ b/tests/auto/widgets/dialogs/qfiledialog2/BLACKLIST
@@ -1,2 +1,4 @@
 [QTBUG4419_lineEditSelectAll]
-osx
+osx-10.12
+osx-10.14
+osx-10.13
diff --git a/tests/auto/widgets/dialogs/qfiledialog2/tst_qfiledialog2.cpp b/tests/auto/widgets/dialogs/qfiledialog2/tst_qfiledialog2.cpp
index 869418371c..40eff1e4c3 100644
--- a/tests/auto/widgets/dialogs/qfiledialog2/tst_qfiledialog2.cpp
+++ b/tests/auto/widgets/dialogs/qfiledialog2/tst_qfiledialog2.cpp
@@ -378,24 +378,24 @@ void tst_QFileDialog2::task143519_deleteAndRenameActionBehavior()
     // defaults
     QVERIFY(openContextMenu(fd));
     QCOMPARE(fd.selectedFiles(), QStringList(ctx.file.fileName()));
-    QCOMPARE(rm->isEnabled(), !fd.isReadOnly());
-    QCOMPARE(mv->isEnabled(), !fd.isReadOnly());
+    QCOMPARE(rm->isEnabled(), !fd.testOption(QFileDialog::ReadOnly));
+    QCOMPARE(mv->isEnabled(), !fd.testOption(QFileDialog::ReadOnly));
 
     // change to non-defaults:
-    fd.setReadOnly(!fd.isReadOnly());
+    fd.setOption(QFileDialog::ReadOnly, !fd.testOption(QFileDialog::ReadOnly));
 
     QVERIFY(openContextMenu(fd));
     QCOMPARE(fd.selectedFiles().size(), 1);
-    QCOMPARE(rm->isEnabled(), !fd.isReadOnly());
-    QCOMPARE(mv->isEnabled(), !fd.isReadOnly());
+    QCOMPARE(rm->isEnabled(), !fd.testOption(QFileDialog::ReadOnly));
+    QCOMPARE(mv->isEnabled(), !fd.testOption(QFileDialog::ReadOnly));
 
     // and changed back to defaults:
-    fd.setReadOnly(!fd.isReadOnly());
+    fd.setOption(QFileDialog::ReadOnly, !fd.testOption(QFileDialog::ReadOnly));
 
     QVERIFY(openContextMenu(fd));
     QCOMPARE(fd.selectedFiles().size(), 1);
-    QCOMPARE(rm->isEnabled(), !fd.isReadOnly());
-    QCOMPARE(mv->isEnabled(), !fd.isReadOnly());
+    QCOMPARE(rm->isEnabled(), !fd.testOption(QFileDialog::ReadOnly));
+    QCOMPARE(mv->isEnabled(), !fd.testOption(QFileDialog::ReadOnly));
 }
 #endif // !QT_NO_CONTEXTMENU && !QT_NO_MENU
 
diff --git a/tests/auto/widgets/dialogs/qfilesystemmodel/BLACKLIST b/tests/auto/widgets/dialogs/qfilesystemmodel/BLACKLIST
index f78d23c6b1..f2f0f8d26e 100644
--- a/tests/auto/widgets/dialogs/qfilesystemmodel/BLACKLIST
+++ b/tests/auto/widgets/dialogs/qfilesystemmodel/BLACKLIST
@@ -1,13 +1,19 @@
 winrt
+[sort]
+winrt
 [sort:QFileDialog usage]
 ubuntu
 b2qt
 [specialFiles]
-ubuntu
 b2qt
 [dirsBeforeFiles]
-ubuntu
+ubuntu-16.04
+rhel-7.6
+windows-10 msvc-2017
+ubuntu-18.04
 b2qt
-windows
-rhel
-suse-leap
+winrt
+windows-10 msvc-2015
+
+[drives]
+winrt
diff --git a/tests/auto/widgets/dialogs/qfilesystemmodel/tst_qfilesystemmodel.cpp b/tests/auto/widgets/dialogs/qfilesystemmodel/tst_qfilesystemmodel.cpp
index 665a116a3a..f8f40e8488 100644
--- a/tests/auto/widgets/dialogs/qfilesystemmodel/tst_qfilesystemmodel.cpp
+++ b/tests/auto/widgets/dialogs/qfilesystemmodel/tst_qfilesystemmodel.cpp
@@ -65,18 +65,18 @@
         } \
     } while(0)
 
-class tst_QFileSystemModel : public QObject {
-  Q_OBJECT
+Q_DECLARE_METATYPE(QDir::Filters)
+Q_DECLARE_METATYPE(QFileDevice::Permissions)
 
-public:
-    tst_QFileSystemModel();
+Q_LOGGING_CATEGORY(lcFileSystemModel, "qt.widgets.tests.qfilesystemmodel")
 
-public Q_SLOTS:
-    void init();
-    void cleanup();
+class tst_QFileSystemModel : public QObject {
+  Q_OBJECT
 
 private slots:
     void initTestCase();
+    void cleanup();
+
     void indexPath();
 
     void rootPath();
@@ -128,48 +128,33 @@ private slots:
     void fileInfo();
 
 protected:
-    bool createFiles(const QString &test_path, const QStringList &initial_files, int existingFileCount = 0, const QStringList &intial_dirs = QStringList());
-    QModelIndex prepareTestModelRoot(const QString &test_path, QSignalSpy **spy2 = nullptr,
-                                     QSignalSpy **spy3 = nullptr);
+    bool createFiles(QFileSystemModel *model, const QString &test_path,
+                     const QStringList &initial_files, int existingFileCount = 0,
+                     const QStringList &initial_dirs = QStringList());
+    QModelIndex prepareTestModelRoot(QFileSystemModel *model, const QString &test_path,
+                                     QSignalSpy **spy2 = nullptr, QSignalSpy **spy3 = nullptr);
 
 private:
-    QFileSystemModel *model;
     QString flatDirTestPath;
     QTemporaryDir m_tempDir;
 };
 
-tst_QFileSystemModel::tst_QFileSystemModel() : model(0)
-{
-}
-
-void tst_QFileSystemModel::init()
-{
-    cleanup();
-    QCOMPARE(model, nullptr);
-    model = new QFileSystemModel;
-}
-
 void tst_QFileSystemModel::cleanup()
 {
-    delete model;
-    model = 0;
-    QString tmp = flatDirTestPath;
-    QDir dir(tmp);
-    if (dir.exists(tmp)) {
-        QStringList list = dir.entryList(QDir::AllEntries | QDir::System | QDir::Hidden | QDir::NoDotAndDotDot);
-        for (int i = 0; i < list.count(); ++i) {
-            QFileInfo fi(dir.path() + '/' + list.at(i));
-            if (fi.exists() && fi.isFile()) {
-                QFile p(fi.absoluteFilePath());
-                p.setPermissions(QFile::ReadUser | QFile::ReadOwner | QFile::ExeOwner | QFile::ExeUser | QFile::WriteUser | QFile::WriteOwner | QFile::WriteOther);
-                QFile dead(dir.path() + '/' + list.at(i));
-                dead.remove();
+    QDir dir(flatDirTestPath);
+    if (dir.exists()) {
+        const QDir::Filters filters = QDir::AllEntries | QDir::System | QDir::Hidden | QDir::NoDotAndDotDot;
+        const QFileInfoList list = dir.entryInfoList(filters);
+        for (const QFileInfo &fi : list) {
+            if (fi.isDir()) {
+                QVERIFY(dir.rmdir(fi.fileName()));
+            } else {
+                QFile dead(fi.absoluteFilePath());
+                dead.setPermissions(QFile::ReadUser | QFile::ReadOwner | QFile::ExeOwner | QFile::ExeUser | QFile::WriteUser | QFile::WriteOwner | QFile::WriteOther);
+                QVERIFY(dead.remove());
             }
-            if (fi.exists() && fi.isDir())
-                QVERIFY(dir.rmdir(list.at(i)));
         }
-        list = dir.entryList(QDir::AllEntries | QDir::System | QDir::Hidden | QDir::NoDotAndDotDot);
-        QCOMPARE(list.count(), 0);
+        QVERIFY(dir.entryInfoList(filters).isEmpty());
     }
 }
 
@@ -182,6 +167,7 @@ void tst_QFileSystemModel::initTestCase()
 void tst_QFileSystemModel::indexPath()
 {
 #if !defined(Q_OS_WIN)
+    QScopedPointer<QFileSystemModel> model(new QFileSystemModel);
     int depth = QDir::currentPath().count('/');
     model->setRootPath(QDir::currentPath());
     QString backPath;
@@ -195,9 +181,10 @@ void tst_QFileSystemModel::indexPath()
 
 void tst_QFileSystemModel::rootPath()
 {
+    QScopedPointer<QFileSystemModel> model(new QFileSystemModel);
     QCOMPARE(model->rootPath(), QString(QDir().path()));
 
-    QSignalSpy rootChanged(model, SIGNAL(rootPathChanged(QString)));
+    QSignalSpy rootChanged(model.data(), &QFileSystemModel::rootPathChanged);
     QModelIndex root = model->setRootPath(model->rootPath());
     root = model->setRootPath("this directory shouldn't exist");
     QCOMPARE(rootChanged.count(), 0);
@@ -243,6 +230,7 @@ void tst_QFileSystemModel::rootPath()
 
 void tst_QFileSystemModel::readOnly()
 {
+    QScopedPointer<QFileSystemModel> model(new QFileSystemModel);
     QCOMPARE(model->isReadOnly(), true);
     QTemporaryFile file(flatDirTestPath + QStringLiteral("/XXXXXX.dat"));
     QVERIFY2(file.open(), qPrintable(file.errorString()));
@@ -263,19 +251,21 @@ void tst_QFileSystemModel::readOnly()
 class CustomFileIconProvider : public QFileIconProvider
 {
 public:
-    CustomFileIconProvider() : QFileIconProvider() {
-        mb = qApp->style()->standardIcon(QStyle::SP_MessageBoxCritical);
-        dvd = qApp->style()->standardIcon(QStyle::SP_DriveDVDIcon);
+    CustomFileIconProvider() : QFileIconProvider()
+    {
+        auto style = QApplication::style();
+        mb = style->standardIcon(QStyle::SP_MessageBoxCritical);
+        dvd = style->standardIcon(QStyle::SP_DriveDVDIcon);
     }
 
-    virtual QIcon icon(const QFileInfo &info) const
+    QIcon icon(const QFileInfo &info) const override
     {
         if (info.isDir())
             return mb;
 
         return QFileIconProvider::icon(info);
     }
-    virtual QIcon icon(IconType type) const
+    QIcon icon(IconType type) const override
     {
         if (type == QFileIconProvider::Folder)
             return dvd;
@@ -289,69 +279,67 @@ private:
 
 void tst_QFileSystemModel::iconProvider()
 {
+    QScopedPointer<QFileSystemModel> model(new QFileSystemModel);
     QVERIFY(model->iconProvider());
-    QFileIconProvider *p = new QFileIconProvider();
-    model->setIconProvider(p);
-    QCOMPARE(model->iconProvider(), p);
-    model->setIconProvider(0);
-    delete p;
+    QScopedPointer<QFileIconProvider> provider(new QFileIconProvider);
+    model->setIconProvider(provider.data());
+    QCOMPARE(model->iconProvider(), provider.data());
+    model->setIconProvider(nullptr);
+    provider.reset();
 
-    QFileSystemModel *myModel = new QFileSystemModel();
+    QScopedPointer<QFileSystemModel> myModel(new QFileSystemModel);
     const QStringList documentPaths = QStandardPaths::standardLocations(QStandardPaths::DocumentsLocation);
     QVERIFY(!documentPaths.isEmpty());
-    const QString documentPath = documentPaths.front();
-    myModel->setRootPath(documentPath);
+    myModel->setRootPath(documentPaths.constFirst());
     //We change the provider, icons must be updated
-    CustomFileIconProvider *custom = new CustomFileIconProvider();
-    myModel->setIconProvider(custom);
+    provider.reset(new CustomFileIconProvider);
+    myModel->setIconProvider(provider.data());
 
-    QPixmap mb = qApp->style()->standardIcon(QStyle::SP_MessageBoxCritical).pixmap(50, 50);
+    QPixmap mb = QApplication::style()->standardIcon(QStyle::SP_MessageBoxCritical).pixmap(50, 50);
     QCOMPARE(myModel->fileIcon(myModel->index(QDir::homePath())).pixmap(50, 50), mb);
-    delete myModel;
-    delete custom;
 }
 
-bool tst_QFileSystemModel::createFiles(const QString &test_path, const QStringList &initial_files, int existingFileCount, const QStringList &initial_dirs)
+bool tst_QFileSystemModel::createFiles(QFileSystemModel *model, const QString &test_path,
+                                       const QStringList &initial_files, int existingFileCount,
+                                       const QStringList &initial_dirs)
 {
-    //qDebug() << (model->rowCount(model->index(test_path))) << existingFileCount << initial_files;
+    qCDebug(lcFileSystemModel) << (model->rowCount(model->index(test_path))) << existingFileCount << initial_files;
     bool timedOut = false;
     TRY_WAIT((model->rowCount(model->index(test_path)) == existingFileCount), &timedOut);
     if (timedOut)
         return false;
 
-    for (int i = 0; i < initial_dirs.count(); ++i) {
-        QDir dir(test_path);
-        if (!dir.exists()) {
-            qWarning() << "error" << test_path << "doesn't exists";
-            return false;
-        }
-        if(!dir.mkdir(initial_dirs.at(i))) {
-            qWarning() << "error" << "failed to make" << initial_dirs.at(i);
+    QDir dir(test_path);
+    if (!dir.exists()) {
+        qWarning() << "error" << test_path << "doesn't exist";
+        return false;
+    }
+    for (const auto &initial_dir : initial_dirs) {
+        if (!dir.mkdir(initial_dir)) {
+            qWarning() << "error" << "failed to make" << initial_dir;
             return false;
         }
-        //qDebug() << test_path + '/' + initial_dirs.at(i) << (QFile::exists(test_path + '/' + initial_dirs.at(i)));
+        qCDebug(lcFileSystemModel) << test_path + '/' + initial_dir << (QFile::exists(test_path + '/' + initial_dir));
     }
-    for (int i = 0; i < initial_files.count(); ++i) {
-        QFile file(test_path + '/' + initial_files.at(i));
+    for (const auto &initial_file : initial_files) {
+        QFile file(test_path + '/' + initial_file);
         if (!file.open(QIODevice::WriteOnly | QIODevice::Append)) {
-            qDebug() << "failed to open file" << initial_files.at(i);
+            qDebug() << "failed to open file" << initial_file;
             return false;
         }
         if (!file.resize(1024 + file.size())) {
-            qDebug() << "failed to resize file" << initial_files.at(i);
+            qDebug() << "failed to resize file" << initial_file;
             return false;
         }
         if (!file.flush()) {
-            qDebug() << "failed to flush file" << initial_files.at(i);
+            qDebug() << "failed to flush file" << initial_file;
             return false;
         }
         file.close();
 #if defined(Q_OS_WIN)
-        if (initial_files.at(i)[0] == '.') {
-            QString hiddenFile = QDir::toNativeSeparators(file.fileName());
-            wchar_t nativeHiddenFile[MAX_PATH];
-            memset(nativeHiddenFile, 0, sizeof(nativeHiddenFile));
-            hiddenFile.toWCharArray(nativeHiddenFile);
+        if (initial_file[0] == '.') {
+            const QString hiddenFile = QDir::toNativeSeparators(file.fileName());
+            const auto nativeHiddenFile = reinterpret_cast<const wchar_t *>(hiddenFile.utf16());
 #ifndef Q_OS_WINRT
             DWORD currentAttributes = ::GetFileAttributes(nativeHiddenFile);
 #else // !Q_OS_WINRT
@@ -370,13 +358,13 @@ bool tst_QFileSystemModel::createFiles(const QString &test_path, const QStringLi
             }
         }
 #endif
-        //qDebug() << test_path + '/' + initial_files.at(i) << (QFile::exists(test_path + '/' + initial_files.at(i)));
+        qCDebug(lcFileSystemModel) << test_path + '/' + initial_file << (QFile::exists(test_path + '/' + initial_file));
     }
     return true;
 }
 
-QModelIndex tst_QFileSystemModel::prepareTestModelRoot(const QString &test_path, QSignalSpy **spy2,
-                                                       QSignalSpy **spy3)
+QModelIndex tst_QFileSystemModel::prepareTestModelRoot(QFileSystemModel *model, const QString &test_path,
+                                                       QSignalSpy **spy2, QSignalSpy **spy3)
 {
     if (model->rowCount(model->index(test_path)) != 0)
         return QModelIndex();
@@ -387,9 +375,8 @@ QModelIndex tst_QFileSystemModel::prepareTestModelRoot(const QString &test_path,
         *spy3 = new QSignalSpy(model, &QFileSystemModel::rowsAboutToBeInserted);
 
     QStringList files = { "b", "d", "f", "h", "j", ".a", ".c", ".e", ".g" };
-    QString l = "b,d,f,h,j,.a,.c,.e,.g";
 
-    if (!createFiles(test_path, files))
+    if (!createFiles(model, test_path, files))
         return QModelIndex();
 
     QModelIndex root = model->setRootPath(test_path);
@@ -406,10 +393,10 @@ QModelIndex tst_QFileSystemModel::prepareTestModelRoot(const QString &test_path,
 
 void tst_QFileSystemModel::rowCount()
 {
-    const QString tmp = flatDirTestPath;
     QSignalSpy *spy2 = nullptr;
     QSignalSpy *spy3 = nullptr;
-    QModelIndex root = prepareTestModelRoot(flatDirTestPath, &spy2, &spy3);
+    QScopedPointer<QFileSystemModel> model(new QFileSystemModel);
+    QModelIndex root = prepareTestModelRoot(model.data(), flatDirTestPath, &spy2, &spy3);
     QVERIFY(root.isValid());
 
     QVERIFY(spy2 && spy2->count() > 0);
@@ -419,11 +406,11 @@ void tst_QFileSystemModel::rowCount()
 void tst_QFileSystemModel::rowsInserted_data()
 {
     QTest::addColumn<int>("count");
-    QTest::addColumn<int>("ascending");
+    QTest::addColumn<Qt::SortOrder>("ascending");
     for (int i = 0; i < 4; ++i) {
         const QByteArray iB = QByteArray::number(i);
-        QTest::newRow(("Qt::AscendingOrder " + iB).constData()) << i << (int)Qt::AscendingOrder;
-        QTest::newRow(("Qt::DescendingOrder " + iB).constData()) << i << (int)Qt::DescendingOrder;
+        QTest::newRow(("Qt::AscendingOrder " + iB).constData()) << i << Qt::AscendingOrder;
+        QTest::newRow(("Qt::DescendingOrder " + iB).constData()) << i << Qt::DescendingOrder;
     }
 }
 
@@ -436,20 +423,21 @@ static inline QString lastEntry(const QModelIndex &root)
 void tst_QFileSystemModel::rowsInserted()
 {
     const QString tmp = flatDirTestPath;
-    QModelIndex root = prepareTestModelRoot(tmp);
+    QScopedPointer<QFileSystemModel> model(new QFileSystemModel);
+    QModelIndex root = prepareTestModelRoot(model.data(), tmp);
     QVERIFY(root.isValid());
 
-    QFETCH(int, ascending);
+    QFETCH(Qt::SortOrder, ascending);
     QFETCH(int, count);
-    model->sort(0, (Qt::SortOrder)ascending);
+    model->sort(0, ascending);
 
-    QSignalSpy spy0(model, SIGNAL(rowsInserted(QModelIndex,int,int)));
-    QSignalSpy spy1(model, SIGNAL(rowsAboutToBeInserted(QModelIndex,int,int)));
+    QSignalSpy spy0(model.data(), &QAbstractItemModel::rowsInserted);
+    QSignalSpy spy1(model.data(), &QAbstractItemModel::rowsAboutToBeInserted);
     int oldCount = model->rowCount(root);
     QStringList files;
     for (int i = 0; i < count; ++i)
         files.append(QLatin1Char('c') + QString::number(i));
-    QVERIFY(createFiles(tmp, files, 5));
+    QVERIFY(createFiles(model.data(), tmp, files, 5));
     QTRY_COMPARE(model->rowCount(root), oldCount + count);
     int totalRowsInserted = 0;
     for (int i = 0; i < spy0.count(); ++i) {
@@ -469,7 +457,7 @@ void tst_QFileSystemModel::rowsInserted()
     }
     if (count == 0) QCOMPARE(spy1.count(), 0); else QVERIFY(spy1.count() >= 1);
 
-    QVERIFY(createFiles(tmp, QStringList(".hidden_file"), 5 + count));
+    QVERIFY(createFiles(model.data(), tmp, QStringList(".hidden_file"), 5 + count));
 
     if (count != 0)
         QTRY_VERIFY(spy0.count() >= 1);
@@ -489,19 +477,21 @@ void tst_QFileSystemModel::rowsRemoved_data()
 void tst_QFileSystemModel::rowsRemoved()
 {
     const QString tmp = flatDirTestPath;
-    QModelIndex root = prepareTestModelRoot(tmp);
+    QScopedPointer<QFileSystemModel> model(new QFileSystemModel);
+    QModelIndex root = prepareTestModelRoot(model.data(), tmp);
     QVERIFY(root.isValid());
 
     QFETCH(int, count);
-    QFETCH(int, ascending);
-    model->sort(0, (Qt::SortOrder)ascending);
+    QFETCH(Qt::SortOrder, ascending);
+    model->sort(0, ascending);
 
-    QSignalSpy spy0(model, SIGNAL(rowsRemoved(QModelIndex,int,int)));
-    QSignalSpy spy1(model, SIGNAL(rowsAboutToBeRemoved(QModelIndex,int,int)));
+    QSignalSpy spy0(model.data(), &QAbstractItemModel::rowsRemoved);
+    QSignalSpy spy1(model.data(), &QAbstractItemModel::rowsAboutToBeRemoved);
     int oldCount = model->rowCount(root);
     for (int i = count - 1; i >= 0; --i) {
-        //qDebug() << "removing" <<  model->index(i, 0, root).data().toString();
-        QVERIFY(QFile::remove(tmp + '/' + model->index(i, 0, root).data().toString()));
+        const QString fileName = model->index(i, 0, root).data().toString();
+        qCDebug(lcFileSystemModel) << "removing" << fileName;
+        QVERIFY(QFile::remove(tmp + QLatin1Char('/') + fileName));
     }
     for (int i = 0 ; i < 10; ++i) {
         if (count != 0) {
@@ -520,18 +510,23 @@ void tst_QFileSystemModel::rowsRemoved()
             lst.append(model->index(i, 0, root).data().toString());
         if (model->rowCount(root) == oldCount - count)
             break;
-        qDebug() << "still have:" << lst << QFile::exists(tmp + '/' + QString(".a"));
+        qCDebug(lcFileSystemModel) << "still have:" << lst << QFile::exists(tmp + QLatin1String("/.a"));
         QDir tmpLister(tmp);
-        qDebug() << tmpLister.entryList();
+        qCDebug(lcFileSystemModel) << tmpLister.entryList();
     }
     QTRY_COMPARE(model->rowCount(root), oldCount - count);
 
-    QVERIFY(QFile::exists(tmp + '/' + QString(".a")));
-    QVERIFY(QFile::remove(tmp + '/' + QString(".a")));
-    QVERIFY(QFile::remove(tmp + '/' + QString(".c")));
+    QVERIFY(QFile::exists(tmp + QLatin1String("/.a")));
+    QVERIFY(QFile::remove(tmp + QLatin1String("/.a")));
+    QVERIFY(QFile::remove(tmp + QLatin1String("/.c")));
 
-    if (count != 0) QVERIFY(spy0.count() >= 1); else QCOMPARE(spy0.count(), 0);
-    if (count != 0) QVERIFY(spy1.count() >= 1); else QCOMPARE(spy1.count(), 0);
+    if (count != 0) {
+        QVERIFY(spy0.count() >= 1);
+        QVERIFY(spy1.count() >= 1);
+    } else {
+        QCOMPARE(spy0.count(), 0);
+        QCOMPARE(spy1.count(), 0);
+    }
 }
 
 void tst_QFileSystemModel::dataChanged_data()
@@ -544,18 +539,19 @@ void tst_QFileSystemModel::dataChanged()
     QSKIP("This can't be tested right now since we don't watch files, only directories.");
 
     const QString tmp = flatDirTestPath;
-    QModelIndex root = prepareTestModelRoot(tmp);
+    QScopedPointer<QFileSystemModel> model(new QFileSystemModel);
+    QModelIndex root = prepareTestModelRoot(model.data(), tmp);
     QVERIFY(root.isValid());
 
     QFETCH(int, count);
-    QFETCH(int, assending);
-    model->sort(0, (Qt::SortOrder)assending);
+    QFETCH(Qt::SortOrder, ascending);
+    model->sort(0, ascending);
 
-    QSignalSpy spy(model, SIGNAL(dataChanged(QModelIndex,QModelIndex)));
+    QSignalSpy spy(model.data(), &QAbstractItemModel::dataChanged);
     QStringList files;
     for (int i = 0; i < count; ++i)
         files.append(model->index(i, 0, root).data().toString());
-    createFiles(tmp, files);
+    createFiles(model.data(), tmp, files);
 
     QTest::qWait(WAITTIME);
 
@@ -566,64 +562,68 @@ void tst_QFileSystemModel::filters_data()
 {
     QTest::addColumn<QStringList>("files");
     QTest::addColumn<QStringList>("dirs");
-    QTest::addColumn<int>("dirFilters");
+    QTest::addColumn<QDir::Filters>("dirFilters");
     QTest::addColumn<QStringList>("nameFilters");
     QTest::addColumn<int>("rowCount");
-    QTest::newRow("no dirs") << (QStringList() << "a" << "b" << "c") << QStringList() << (int)(QDir::Dirs) << QStringList() << 2;
-    QTest::newRow("no dirs - dot") << (QStringList() << "a" << "b" << "c") << QStringList() << (int)(QDir::Dirs | QDir::NoDot) << QStringList() << 1;
-    QTest::newRow("no dirs - dotdot") << (QStringList() << "a" << "b" << "c") << QStringList() << (int)(QDir::Dirs | QDir::NoDotDot) << QStringList() << 1;
-    QTest::newRow("no dirs - dotanddotdot") << (QStringList() << "a" << "b" << "c") << QStringList() << (int)(QDir::Dirs | QDir::NoDotAndDotDot) << QStringList() << 0;
-    QTest::newRow("one dir - dot") << (QStringList() << "a" << "b" << "c") << (QStringList() << "Z") << (int)(QDir::Dirs | QDir::NoDot) << QStringList() << 2;
-    QTest::newRow("one dir - dotdot") << (QStringList() << "a" << "b" << "c") << (QStringList() << "Z") << (int)(QDir::Dirs | QDir::NoDotDot) << QStringList() << 2;
-    QTest::newRow("one dir - dotanddotdot") << (QStringList() << "a" << "b" << "c") << (QStringList() << "Z") << (int)(QDir::Dirs | QDir::NoDotAndDotDot) << QStringList() << 1;
-    QTest::newRow("one dir") << (QStringList() << "a" << "b" << "c") << (QStringList() << "Z") << (int)(QDir::Dirs) << QStringList() << 3;
-    QTest::newRow("no dir + hidden") << (QStringList() << "a" << "b" << "c") << QStringList() << (int)(QDir::Dirs | QDir::Hidden) << QStringList() << 2;
-    QTest::newRow("dir+hid+files") << (QStringList() << "a" << "b" << "c") << QStringList() <<
-                         (int)(QDir::Dirs | QDir::Files | QDir::Hidden) << QStringList() << 5;
-    QTest::newRow("dir+file+hid-dot .A") << (QStringList() << "a" << "b" << "c") << (QStringList() << ".A") <<
-                         (int)(QDir::Dirs | QDir::Files | QDir::Hidden | QDir::NoDotAndDotDot) << QStringList() << 4;
-    QTest::newRow("dir+files+hid+dot A") << (QStringList() << "a" << "b" << "c") << (QStringList() << "AFolder") <<
-                         (int)(QDir::Dirs | QDir::Files | QDir::Hidden | QDir::NoDotAndDotDot) << (QStringList() << "A*") << 2;
-    QTest::newRow("dir+files+hid+dot+cas1") << (QStringList() << "a" << "b" << "c") << (QStringList() << "Z") <<
-                         (int)(QDir::Dirs | QDir::Files | QDir::Hidden | QDir::NoDotAndDotDot | QDir::CaseSensitive) << (QStringList() << "Z") << 1;
-    QTest::newRow("dir+files+hid+dot+cas2") << (QStringList() << "a" << "b" << "c") << (QStringList() << "Z") <<
-                         (int)(QDir::Dirs | QDir::Files | QDir::Hidden | QDir::NoDotAndDotDot | QDir::CaseSensitive) << (QStringList() << "a") << 1;
-    QTest::newRow("dir+files+hid+dot+cas+alldir") << (QStringList() << "a" << "b" << "c") << (QStringList() << "Z") <<
-                         (int)(QDir::Dirs | QDir::Files | QDir::Hidden | QDir::NoDotAndDotDot | QDir::CaseSensitive | QDir::AllDirs) << (QStringList() << "Z") << 1;
-
-    QTest::newRow("case sensitive") << (QStringList() << "Antiguagdb" << "Antiguamtd"
-        << "Antiguamtp" << "afghanistangdb" << "afghanistanmtd")
-        << QStringList() << (int)(QDir::Files) << QStringList() << 5;
+
+    const QStringList abcList{QLatin1String("a"), QLatin1String("b"), QLatin1String("c")};
+    const QStringList zList{QLatin1String("Z")};
+
+    QTest::newRow("no dirs") << abcList << QStringList() << QDir::Filters(QDir::Dirs) << QStringList() << 2;
+    QTest::newRow("no dirs - dot") << abcList << QStringList() << (QDir::Dirs | QDir::NoDot) << QStringList() << 1;
+    QTest::newRow("no dirs - dotdot") << abcList << QStringList() << (QDir::Dirs | QDir::NoDotDot) << QStringList() << 1;
+    QTest::newRow("no dirs - dotanddotdot") << abcList << QStringList() << (QDir::Dirs | QDir::NoDotAndDotDot) << QStringList() << 0;
+    QTest::newRow("one dir - dot") << abcList << zList << (QDir::Dirs | QDir::NoDot) << QStringList() << 2;
+    QTest::newRow("one dir - dotdot") << abcList << zList << (QDir::Dirs | QDir::NoDotDot) << QStringList() << 2;
+    QTest::newRow("one dir - dotanddotdot") << abcList << zList << (QDir::Dirs | QDir::NoDotAndDotDot) << QStringList() << 1;
+    QTest::newRow("one dir") << abcList << zList << QDir::Filters(QDir::Dirs) << QStringList() << 3;
+    QTest::newRow("no dir + hidden") << abcList << QStringList() << (QDir::Dirs | QDir::Hidden) << QStringList() << 2;
+    QTest::newRow("dir+hid+files") << abcList << QStringList() <<
+                         (QDir::Dirs | QDir::Files | QDir::Hidden) << QStringList() << 5;
+    QTest::newRow("dir+file+hid-dot .A") << abcList << QStringList{QLatin1String(".A")} <<
+                         (QDir::Dirs | QDir::Files | QDir::Hidden | QDir::NoDotAndDotDot) << QStringList() << 4;
+    QTest::newRow("dir+files+hid+dot A") << abcList << QStringList{QLatin1String("AFolder")} <<
+                         (QDir::Dirs | QDir::Files | QDir::Hidden | QDir::NoDotAndDotDot) << QStringList{QLatin1String("A*")} << 2;
+    QTest::newRow("dir+files+hid+dot+cas1") << abcList << zList <<
+                         (QDir::Dirs | QDir::Files | QDir::Hidden | QDir::NoDotAndDotDot | QDir::CaseSensitive) << zList << 1;
+    QTest::newRow("dir+files+hid+dot+cas2") << abcList << zList <<
+                         (QDir::Dirs | QDir::Files | QDir::Hidden | QDir::NoDotAndDotDot | QDir::CaseSensitive) << QStringList{QLatin1String("a")} << 1;
+    QTest::newRow("dir+files+hid+dot+cas+alldir") << abcList << zList <<
+                         (QDir::Dirs | QDir::Files | QDir::Hidden | QDir::NoDotAndDotDot | QDir::CaseSensitive | QDir::AllDirs) << zList << 1;
+
+    QTest::newRow("case sensitive") << QStringList{QLatin1String("Antiguagdb"), QLatin1String("Antiguamtd"),
+        QLatin1String("Antiguamtp"), QLatin1String("afghanistangdb"), QLatin1String("afghanistanmtd")}
+        << QStringList() << QDir::Filters(QDir::Files) << QStringList() << 5;
 }
 
 void tst_QFileSystemModel::filters()
 {
     QString tmp = flatDirTestPath;
-    QVERIFY(createFiles(tmp, QStringList()));
+    QScopedPointer<QFileSystemModel> model(new QFileSystemModel);
+    QVERIFY(createFiles(model.data(), tmp, QStringList()));
     QModelIndex root = model->setRootPath(tmp);
     QFETCH(QStringList, files);
     QFETCH(QStringList, dirs);
-    QFETCH(int, dirFilters);
+    QFETCH(QDir::Filters, dirFilters);
     QFETCH(QStringList, nameFilters);
     QFETCH(int, rowCount);
 
     if (nameFilters.count() > 0)
         model->setNameFilters(nameFilters);
     model->setNameFilterDisables(false);
-    model->setFilter((QDir::Filters)dirFilters);
+    model->setFilter(dirFilters);
 
-    QVERIFY(createFiles(tmp, files, 0, dirs));
+    QVERIFY(createFiles(model.data(), tmp, files, 0, dirs));
     QTRY_COMPARE(model->rowCount(root), rowCount);
 
     // Make sure that we do what QDir does
     QDir xFactor(tmp);
-    QDir::Filters  filters = (QDir::Filters)dirFilters;
     QStringList dirEntries;
 
     if (nameFilters.count() > 0)
-        dirEntries = xFactor.entryList(nameFilters, filters);
+        dirEntries = xFactor.entryList(nameFilters, dirFilters);
     else
-        dirEntries = xFactor.entryList(filters);
+        dirEntries = xFactor.entryList(dirFilters);
 
     QCOMPARE(dirEntries.count(), rowCount);
 
@@ -667,12 +667,13 @@ void tst_QFileSystemModel::nameFilters()
 {
     QStringList list;
     list << "a" << "b" << "c";
+    QScopedPointer<QFileSystemModel> model(new QFileSystemModel);
     model->setNameFilters(list);
     model->setNameFilterDisables(false);
     QCOMPARE(model->nameFilters(), list);
 
     QString tmp = flatDirTestPath;
-    QVERIFY(createFiles(tmp, list));
+    QVERIFY(createFiles(model.data(), tmp, list));
     QModelIndex root = model->setRootPath(tmp);
     QTRY_COMPARE(model->rowCount(root), 3);
 
@@ -693,15 +694,17 @@ void tst_QFileSystemModel::setData_data()
               << QDir::temp().absolutePath() + '/' + "a"
               << false;
     */
+
+    const QStringList abcList{QLatin1String("a"), QLatin1String("b"), QLatin1String("c")};
     QTest::newRow("in current dir")
               << QString()
-              << (QStringList() << "a" << "b" << "c")
+              << abcList
               << "a"
               << "d"
               << true;
     QTest::newRow("in subdir")
               << "s"
-              << (QStringList() << "a" << "b" << "c")
+              << abcList
               << "a"
               << "d"
               << true;
@@ -709,7 +712,8 @@ void tst_QFileSystemModel::setData_data()
 
 void tst_QFileSystemModel::setData()
 {
-    QSignalSpy spy(model, SIGNAL(fileRenamed(QString,QString,QString)));
+    QScopedPointer<QFileSystemModel> model(new QFileSystemModel);
+    QSignalSpy spy(model.data(), &QFileSystemModel::fileRenamed);
     QFETCH(QString, subdirName);
     QFETCH(QStringList, files);
     QFETCH(QString, oldFileName);
@@ -722,7 +726,7 @@ void tst_QFileSystemModel::setData()
         QVERIFY(dir.mkdir(subdirName));
         tmp.append('/' + subdirName);
     }
-    QVERIFY(createFiles(tmp, files));
+    QVERIFY(createFiles(model.data(), tmp, files));
     QModelIndex tmpIdx = model->setRootPath(flatDirTestPath);
     if (!subdirName.isEmpty()) {
         tmpIdx = model->index(tmp);
@@ -760,6 +764,7 @@ void tst_QFileSystemModel::sortPersistentIndex()
     const QFileInfo fileInfo(file.fileName());
     file.close();
     QTRY_VERIFY(QDir(flatDirTestPath).entryInfoList().contains(fileInfo));
+    QScopedPointer<QFileSystemModel> model(new QFileSystemModel);
     QModelIndex root = model->setRootPath(flatDirTestPath);
     QTRY_VERIFY(model->rowCount(root) > 0);
 
@@ -786,8 +791,9 @@ void tst_QFileSystemModel::sort()
 {
     QFETCH(bool, fileDialogMode);
 
-    MyFriendFileSystemModel *myModel = new MyFriendFileSystemModel();
-    QTreeView *tree = new QTreeView();
+    QScopedPointer<MyFriendFileSystemModel> myModel(new MyFriendFileSystemModel);
+    QTreeView tree;
+    tree.setWindowTitle(QTest::currentTestFunction());
 
     if (fileDialogMode && EmulationDetector::isRunningArmOnX86())
         QSKIP("Crashes in QEMU. QTBUG-70572");
@@ -816,24 +822,23 @@ void tst_QFileSystemModel::sort()
 
     myModel->setRootPath("");
     myModel->setFilter(QDir::AllEntries | QDir::System | QDir::Hidden);
-    tree->setSortingEnabled(true);
-    tree->setModel(myModel);
-    tree->show();
-    tree->resize(800, 800);
-    QVERIFY(QTest::qWaitForWindowActive(tree));
-    tree->header()->setSortIndicator(1,Qt::DescendingOrder);
-    tree->header()->setSectionResizeMode(0, QHeaderView::ResizeToContents);
+    tree.setSortingEnabled(true);
+    tree.setModel(myModel.data());
+    tree.show();
+    tree.resize(800, 800);
+    QVERIFY(QTest::qWaitForWindowActive(&tree));
+    tree.header()->setSortIndicator(1, Qt::DescendingOrder);
+    tree.header()->setSectionResizeMode(0, QHeaderView::ResizeToContents);
     QStringList dirsToOpen;
-    do
-    {
-        dirsToOpen<<dir.absolutePath();
+    do {
+        dirsToOpen << dir.absolutePath();
     } while (dir.cdUp());
 
     for (int i = dirsToOpen.size() -1 ; i > 0 ; --i) {
         QString path = dirsToOpen[i];
-        tree->expand(myModel->index(path, 0));
+        tree.expand(myModel->index(path, 0));
     }
-    tree->expand(myModel->index(dirPath, 0));
+    tree.expand(myModel->index(dirPath, 0));
     QModelIndex parent = myModel->index(dirPath, 0);
     QList<QString> expectedOrder;
     expectedOrder << tempFile2.fileName() << tempFile.fileName() << dirPath + QChar('/') + ".." << dirPath + QChar('/') + ".";
@@ -859,15 +864,13 @@ void tst_QFileSystemModel::sort()
             QTRY_COMPARE(dirPath + QChar('/') + myModel->index(i, 1, parent).data(QFileSystemModel::FileNameRole).toString(), expectedOrder.at(i));
         }
     }
-
-    delete tree;
-    delete myModel;
 }
 
 void tst_QFileSystemModel::mkdir()
 {
     QString tmp = flatDirTestPath;
     QString newFolderPath = QDir::toNativeSeparators(tmp + '/' + "NewFoldermkdirtest4");
+    QScopedPointer<QFileSystemModel> model(new QFileSystemModel);
     QModelIndex tmpDir = model->index(tmp);
     QVERIFY(tmpDir.isValid());
     QDir bestatic(newFolderPath);
@@ -902,6 +905,7 @@ void tst_QFileSystemModel::deleteFile()
         qWarning() << "unable to create" << newFilePath;
     }
     newFile.close();
+    QScopedPointer<QFileSystemModel> model(new QFileSystemModel);
     QModelIndex idx = model->index(newFilePath);
     QVERIFY(idx.isValid());
     QVERIFY(model->remove(idx));
@@ -963,7 +967,8 @@ void tst_QFileSystemModel::caseSensitivity()
     QString tmp = flatDirTestPath;
     QStringList files;
     files << "a" << "c" << "C";
-    QVERIFY(createFiles(tmp, files));
+    QScopedPointer<QFileSystemModel> model(new QFileSystemModel);
+    QVERIFY(createFiles(model.data(), tmp, files));
     QModelIndex root = model->index(tmp);
     QStringList paths;
     QModelIndexList indexes;
@@ -1013,13 +1018,14 @@ void tst_QFileSystemModel::dirsBeforeFiles()
 
     const int itemCount = 3;
     for (int i = 0; i < itemCount; ++i) {
-        QLatin1Char c('a' + i);
-        dir.mkdir(c + QLatin1String("-dir"));
+        QLatin1Char c('a' + char(i));
+        QVERIFY(dir.mkdir(c + QLatin1String("-dir")));
         QFile file(flatDirTestPath + QLatin1Char('/') + c + QLatin1String("-file"));
-        file.open(QIODevice::ReadWrite);
+        QVERIFY(file.open(QIODevice::ReadWrite));
         file.close();
     }
 
+    QScopedPointer<QFileSystemModel> model(new QFileSystemModel);
     QModelIndex root = model->setRootPath(flatDirTestPath);
     // Wait for model to be notified by the file system watcher
     QTRY_COMPARE(model->rowCount(root), 2 * itemCount);
@@ -1073,7 +1079,7 @@ static inline QByteArray permissionRowName(bool readOnly, int permission)
 
 void tst_QFileSystemModel::permissions_data()
 {
-    QTest::addColumn<int>("permissions");
+    QTest::addColumn<QFileDevice::Permissions>("permissions");
     QTest::addColumn<bool>("readOnly");
 
     static const int permissions[] = {
@@ -1081,22 +1087,23 @@ void tst_QFileSystemModel::permissions_data()
         QFile::ReadOwner,
         QFile::WriteOwner|QFile::ReadOwner,
     };
-    for (size_t i = 0; i < sizeof permissions / sizeof *permissions; ++i) {
-        QTest::newRow(permissionRowName(false, permissions[i]).constData()) << permissions[i] << false;
-        QTest::newRow(permissionRowName(true, permissions[i]).constData()) << permissions[i] << true;
+    for (int permission : permissions) {
+        QTest::newRow(permissionRowName(false, permission).constData()) << QFileDevice::Permissions(permission) << false;
+        QTest::newRow(permissionRowName(true, permission).constData()) << QFileDevice::Permissions(permission) << true;
     }
 }
 
 void tst_QFileSystemModel::permissions() // checks QTBUG-20503
 {
-    QFETCH(int, permissions);
+    QFETCH(QFileDevice::Permissions, permissions);
     QFETCH(bool, readOnly);
 
     const QString tmp = flatDirTestPath;
     const QString file = tmp + QLatin1String("/f");
-    QVERIFY(createFiles(tmp, QStringList() << "f"));
+    QScopedPointer<QFileSystemModel> model(new QFileSystemModel);
+    QVERIFY(createFiles(model.data(), tmp, QStringList{QLatin1String("f")}));
 
-    QVERIFY(QFile::setPermissions(file,  QFile::Permissions(permissions)));
+    QVERIFY(QFile::setPermissions(file,  permissions));
 
     const QModelIndex root = model->setRootPath(tmp);
 
diff --git a/tests/auto/widgets/dialogs/qmessagebox/BLACKLIST b/tests/auto/widgets/dialogs/qmessagebox/BLACKLIST
index da52809aad..e633e7c0a3 100644
--- a/tests/auto/widgets/dialogs/qmessagebox/BLACKLIST
+++ b/tests/auto/widgets/dialogs/qmessagebox/BLACKLIST
@@ -1,2 +1,6 @@
 [defaultButton]
-*
+ubuntu-16.04
+rhel-7.6
+opensuse-leap
+ubuntu-18.04
+rhel-7.4
diff --git a/tests/auto/widgets/dialogs/qprogressdialog/BLACKLIST b/tests/auto/widgets/dialogs/qprogressdialog/BLACKLIST
index 1789f51507..2b784414cd 100644
--- a/tests/auto/widgets/dialogs/qprogressdialog/BLACKLIST
+++ b/tests/auto/widgets/dialogs/qprogressdialog/BLACKLIST
@@ -1,2 +1,2 @@
 [autoShow]
-osx ci
+osx-10.13
diff --git a/tests/auto/widgets/effects/qgraphicseffect/BLACKLIST b/tests/auto/widgets/effects/qgraphicseffect/BLACKLIST
index 4833af527f..64a92d18aa 100644
--- a/tests/auto/widgets/effects/qgraphicseffect/BLACKLIST
+++ b/tests/auto/widgets/effects/qgraphicseffect/BLACKLIST
@@ -1,3 +1,2 @@
 [prepareGeometryChangeInvalidateCache]
-opensuse
-opensuse-leap
+opensuse-42.3
diff --git a/tests/auto/widgets/graphicsview/qgraphicsitem/tst_qgraphicsitem.cpp b/tests/auto/widgets/graphicsview/qgraphicsitem/tst_qgraphicsitem.cpp
index 4f3ff15ae0..7b914512ab 100644
--- a/tests/auto/widgets/graphicsview/qgraphicsitem/tst_qgraphicsitem.cpp
+++ b/tests/auto/widgets/graphicsview/qgraphicsitem/tst_qgraphicsitem.cpp
@@ -1811,7 +1811,8 @@ void tst_QGraphicsItem::selected_multi()
 
     {
         // Ctrl-move on item1
-        QMouseEvent event(QEvent::MouseMove, view.mapFromScene(item1->scenePos()) + QPoint(1, 0), Qt::LeftButton, Qt::LeftButton, Qt::ControlModifier);
+        const QPoint item1Point = view.mapFromScene(item1->scenePos()) + QPoint(1, 0);
+        QMouseEvent event(QEvent::MouseMove, item1Point, view.viewport()->mapToGlobal(item1Point), Qt::LeftButton, Qt::LeftButton, Qt::ControlModifier);
         QApplication::sendEvent(view.viewport(), &event);
         QVERIFY(!item1->isSelected());
         QVERIFY(!item2->isSelected());
@@ -1832,7 +1833,8 @@ void tst_QGraphicsItem::selected_multi()
 
     {
         // Ctrl-move on item1
-        QMouseEvent event(QEvent::MouseMove, view.mapFromScene(item1->scenePos()) + QPoint(1, 0), Qt::LeftButton, Qt::LeftButton, Qt::ControlModifier);
+        const QPoint item1Point = view.mapFromScene(item1->scenePos()) + QPoint(1, 0);
+        QMouseEvent event(QEvent::MouseMove, item1Point, view.viewport()->mapToGlobal(item1Point), Qt::LeftButton, Qt::LeftButton, Qt::ControlModifier);
         QApplication::sendEvent(view.viewport(), &event);
         QVERIFY(item1->isSelected());
         QVERIFY(!item2->isSelected());
@@ -4151,6 +4153,8 @@ void tst_QGraphicsItem::cursor()
     QGraphicsView view(&scene);
     view.showFullScreen();
     QVERIFY(QTest::qWaitForWindowExposed(&view));
+    const Qt::CursorShape viewportShape = view.viewport()->cursor().shape();
+
     QGraphicsRectItem *item1 = scene.addRect(QRectF(-100, 0, 50, 50));
     QGraphicsRectItem *item2 = scene.addRect(QRectF(50, 0, 50, 50));
 
@@ -4178,41 +4182,45 @@ void tst_QGraphicsItem::cursor()
     item1->setCursor(Qt::IBeamCursor);
     item2->setCursor(Qt::PointingHandCursor);
 
-    QTest::mouseMove(&view, view.rect().center());
+    QPoint viewCenter = view.rect().center();
+    QPoint item1Center = view.mapFromScene(item1->sceneBoundingRect().center());
+    QPoint item2Center = view.mapFromScene(item2->sceneBoundingRect().center());
 
-    const Qt::CursorShape viewportShape = view.viewport()->cursor().shape();
+    {
+        QMouseEvent event(QEvent::MouseMove, viewCenter, view.viewport()->mapToGlobal(viewCenter), Qt::NoButton, 0, 0);
+        QApplication::sendEvent(view.viewport(), &event);
+    }
+
+    QCOMPARE(view.viewport()->cursor().shape(), viewportShape);
 
     {
-        QTest::mouseMove(view.viewport(), QPoint(100, 50));
-        QMouseEvent event(QEvent::MouseMove, QPoint(100, 50), Qt::NoButton, 0, 0);
+        QMouseEvent event(QEvent::MouseMove, item1Center, view.viewport()->mapToGlobal(item1Center), Qt::NoButton, 0, 0);
         QApplication::sendEvent(view.viewport(), &event);
     }
 
-    QTRY_COMPARE(view.viewport()->cursor().shape(), viewportShape);
+    QCOMPARE(view.viewport()->cursor().shape(), item1->cursor().shape());
 
     {
-        QTest::mouseMove(view.viewport(), view.mapFromScene(item1->sceneBoundingRect().center()));
-        QMouseEvent event(QEvent::MouseMove, view.mapFromScene(item1->sceneBoundingRect().center()), Qt::NoButton, 0, 0);
+        QMouseEvent event(QEvent::MouseMove, item2Center, view.viewport()->mapToGlobal(item2Center), Qt::NoButton, 0, 0);
         QApplication::sendEvent(view.viewport(), &event);
     }
 
-    QTRY_COMPARE(view.viewport()->cursor().shape(), item1->cursor().shape());
+    QCOMPARE(view.viewport()->cursor().shape(), item2->cursor().shape());
 
     {
-        QTest::mouseMove(view.viewport(), view.mapFromScene(item2->sceneBoundingRect().center()));
-        QMouseEvent event(QEvent::MouseMove, view.mapFromScene(item2->sceneBoundingRect().center()), Qt::NoButton, 0, 0);
+        QMouseEvent event(QEvent::MouseMove, viewCenter, view.viewport()->mapToGlobal(viewCenter), Qt::NoButton, 0, 0);
         QApplication::sendEvent(view.viewport(), &event);
     }
 
-    QTRY_COMPARE(view.viewport()->cursor().shape(), item2->cursor().shape());
+    QCOMPARE(view.viewport()->cursor().shape(), viewportShape);
 
+    item1->setEnabled(false);
     {
-        QTest::mouseMove(view.viewport(), view.rect().center());
-        QMouseEvent event(QEvent::MouseMove, QPoint(100, 25), Qt::NoButton, 0, 0);
+        QMouseEvent event(QEvent::MouseMove, item1Center, view.viewport()->mapToGlobal(item1Center), Qt::NoButton, 0, 0);
         QApplication::sendEvent(view.viewport(), &event);
     }
 
-    QTRY_COMPARE(view.viewport()->cursor().shape(), viewportShape);
+    QCOMPARE(view.viewport()->cursor().shape(), viewportShape);
 }
 #endif
 /*
@@ -4433,12 +4441,14 @@ protected:
         case QGraphicsItem::ItemPositionHasChanged:
             break;
         case QGraphicsItem::ItemMatrixChange: {
+#if QT_DEPRECATED_SINCE(5, 13)
 QT_WARNING_PUSH
 QT_WARNING_DISABLE_DEPRECATED
             QVariant variant;
             variant.setValue<QMatrix>(matrix());
             oldValues << variant;
 QT_WARNING_POP
+#endif
         }
             break;
         case QGraphicsItem::ItemTransformChange: {
@@ -4558,6 +4568,7 @@ void tst_QGraphicsItem::itemChange()
         QCOMPARE(tester.oldValues.last(), QVariant(true));
         QCOMPARE(tester.isEnabled(), true);
     }
+#if QT_DEPRECATED_SINCE(5, 13)
     {
 QT_WARNING_PUSH
 QT_WARNING_DISABLE_DEPRECATED // QDesktopWidget::screen()
@@ -4577,6 +4588,7 @@ QT_WARNING_DISABLE_DEPRECATED // QDesktopWidget::screen()
         QCOMPARE(tester.matrix(), QMatrix().rotate(90));
 QT_WARNING_POP
     }
+#endif
     {
         tester.resetTransform();
         ++changeCount;
@@ -5055,12 +5067,6 @@ 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;
@@ -5090,22 +5096,25 @@ void tst_QGraphicsItem::paint()
     PaintTester tester2;
     scene2.addItem(&tester2);
 
-    //First show one paint
-    QTRY_COMPARE(tester2.painted, 1);
+    //First show at least one paint
+    QCOMPARE(tester2.painted, 0);
+    QTRY_VERIFY(tester2.painted > 0);
+    int painted = tester2.painted;
 
     //nominal case, update call paint
     tester2.update();
-    QTRY_COMPARE(tester2.painted, 2);
+    QTRY_COMPARE(tester2.painted, painted + 1);
+    painted = tester2.painted;
 
     //we remove the item from the scene, number of updates is still the same
     tester2.update();
     scene2.removeItem(&tester2);
-    QTRY_COMPARE(tester2.painted, 2);
+    QTRY_COMPARE(tester2.painted, painted);
 
     //We re-add the item, the number of paint should increase
     scene2.addItem(&tester2);
     tester2.update();
-    QTRY_COMPARE(tester2.painted, 3);
+    QTRY_COMPARE(tester2.painted, painted + 1);
 }
 
 class HarakiriItem : public QGraphicsRectItem
@@ -11375,7 +11384,7 @@ void tst_QGraphicsItem::QTBUG_7714_fullUpdateDiscardingOpacityUpdate2()
     origView.reset();
     childYellow->setOpacity(0.0);
 
-    QTRY_COMPARE(origView.repaints, 1);
+    QTRY_VERIFY(origView.repaints > 0);
 
     view.show();
     qApp->setActiveWindow(&view);
@@ -11390,8 +11399,8 @@ void tst_QGraphicsItem::QTBUG_7714_fullUpdateDiscardingOpacityUpdate2()
     QEXPECT_FAIL("", "Fails on WinRT. Figure out why - QTBUG-68297", Abort);
 #endif
 
-    QTRY_COMPARE(origView.repaints, 1);
-    QTRY_COMPARE(view.repaints, 1);
+    QTRY_VERIFY(origView.repaints > 0);
+    QTRY_VERIFY(view.repaints > 0);
 }
 
 void tst_QGraphicsItem::QT_2649_focusScope()
diff --git a/tests/auto/widgets/graphicsview/qgraphicsproxywidget/tst_qgraphicsproxywidget.cpp b/tests/auto/widgets/graphicsview/qgraphicsproxywidget/tst_qgraphicsproxywidget.cpp
index 530c3bb464..39aa65a478 100644
--- a/tests/auto/widgets/graphicsview/qgraphicsproxywidget/tst_qgraphicsproxywidget.cpp
+++ b/tests/auto/widgets/graphicsview/qgraphicsproxywidget/tst_qgraphicsproxywidget.cpp
@@ -463,14 +463,13 @@ void tst_QGraphicsProxyWidget::setWidget()
         QCOMPARE(proxy->focusPolicy(), Qt::WheelFocus);
         QVERIFY(proxy->acceptDrops());
         QCOMPARE(proxy->acceptHoverEvents(), true); // to get widget enter events
-        int left, top, right, bottom;
-        widget->getContentsMargins(&left, &top, &right, &bottom);
+        const QMarginsF margins = QMarginsF{widget->contentsMargins()};
         qreal rleft, rtop, rright, rbottom;
         proxy->getContentsMargins(&rleft, &rtop, &rright, &rbottom);
-        QCOMPARE((qreal)left, rleft);
-        QCOMPARE((qreal)top, rtop);
-        QCOMPARE((qreal)right, rright);
-        QCOMPARE((qreal)bottom, rbottom);
+        QCOMPARE(margins.left(), rleft);
+        QCOMPARE(margins.top(), rtop);
+        QCOMPARE(margins.right(), rright);
+        QCOMPARE(margins.bottom(), rbottom);
     } else {
         // proxy shouldn't mess with the widget if it can't insert it.
         QCOMPARE(proxy->widget(), nullptr);
diff --git a/tests/auto/widgets/graphicsview/qgraphicsscene/BLACKLIST b/tests/auto/widgets/graphicsview/qgraphicsscene/BLACKLIST
index b8b427b3dd..a3c9e2e421 100644
--- a/tests/auto/widgets/graphicsview/qgraphicsscene/BLACKLIST
+++ b/tests/auto/widgets/graphicsview/qgraphicsscene/BLACKLIST
@@ -3,11 +3,5 @@ opensuse-42.3 ci
 [removeFullyTransparentItem]
 osx-10.12
 [tabFocus_sceneWithNestedFocusWidgets]
-opensuse
-opensuse-leap
-[inputMethod]
-opensuse
-opensuse-leap
-[hoverEvents_parentChild]
-ubuntu
+opensuse-42.3
 
diff --git a/tests/auto/widgets/graphicsview/qgraphicsview/BLACKLIST b/tests/auto/widgets/graphicsview/qgraphicsview/BLACKLIST
index ee13a37212..22fce8620b 100644
--- a/tests/auto/widgets/graphicsview/qgraphicsview/BLACKLIST
+++ b/tests/auto/widgets/graphicsview/qgraphicsview/BLACKLIST
@@ -1,20 +1,24 @@
 [task255529_transformationAnchorMouseAndViewportMargins]
-xcb
+opensuse-leap
+rhel-7.4
+ubuntu-16.04
+opensuse-42.3
 [cursor]
-xcb
+opensuse-leap
+ubuntu-16.04
+opensuse-42.3
 [cursor2]
-xcb
-windows
-[rubberBandExtendSelection]
-xcb
-[rotated_rubberBand]
-xcb
+ubuntu-16.04
 [sendEvent]
-xcb
-[forwardMousePress]
-xcb
+ubuntu-16.04
+opensuse-42.3
 [resizeAnchor]
-xcb
+ubuntu-16.04
+rhel-7.6
+opensuse-leap
+ubuntu-18.04
+rhel-7.4
+opensuse-42.3
 [update2]
 opensuse-42.3
 [itemsInRect_cosmeticAdjust]
diff --git a/tests/auto/widgets/graphicsview/qgraphicsview/tst_qgraphicsview.cpp b/tests/auto/widgets/graphicsview/qgraphicsview/tst_qgraphicsview.cpp
index 52cc7ed128..4709499cd6 100644
--- a/tests/auto/widgets/graphicsview/qgraphicsview/tst_qgraphicsview.cpp
+++ b/tests/auto/widgets/graphicsview/qgraphicsview/tst_qgraphicsview.cpp
@@ -2219,7 +2219,7 @@ void tst_QGraphicsView::wheelEvent()
     {
         QWheelEvent event(view.mapFromScene(widget->boundingRect().center()),
                           view.mapToGlobal(view.mapFromScene(widget->boundingRect().center())),
-                          120, 0, 0, Qt::Horizontal);
+                          QPoint(), QPoint(120, 0), Qt::NoButton, Qt::NoModifier, Qt::NoScrollPhase, false);
         QApplication::sendEvent(view.viewport(), &event);
         QCOMPARE(scene.orientation, Qt::Horizontal);
     }
@@ -2228,7 +2228,7 @@ void tst_QGraphicsView::wheelEvent()
     {
         QWheelEvent event(view.mapFromScene(widget->boundingRect().center()),
                           view.mapToGlobal(view.mapFromScene(widget->boundingRect().center())),
-                          120, 0, 0, Qt::Vertical);
+                          QPoint(), QPoint(0, 120), Qt::NoButton, Qt::NoModifier, Qt::NoScrollPhase, false);
         QApplication::sendEvent(view.viewport(), &event);
         QCOMPARE(scene.orientation, Qt::Vertical);
     }
@@ -2526,9 +2526,8 @@ void tst_QGraphicsView::viewportUpdateMode2()
     view.setViewportUpdateMode(QGraphicsView::BoundingRectViewportUpdate);
     view.setScene(&dummyScene);
     view.ensurePolished(); // make sure we get the right content margins
-    int left, top, right, bottom;
-    view.getContentsMargins(&left, &top, &right, &bottom);
-    view.resize(200 + left + right, 200 + top + bottom);
+    const QMargins margins = view.contentsMargins();
+    view.resize(200 + margins.left() + margins.right(), 200 + margins.top() + margins.bottom());
     toplevel.show();
     qApp->setActiveWindow(&toplevel);
     QVERIFY(QTest::qWaitForWindowExposed(&toplevel));
@@ -4043,9 +4042,8 @@ void tst_QGraphicsView::update()
     CustomView view(0, &toplevel);
     view.setScene(&dummyScene);
     view.ensurePolished(); // must ensure polished to get content margins right
-    int left, top, right, bottom;
-    view.getContentsMargins(&left, &top, &right, &bottom);
-    view.resize(200 + left + right, 200 + top + bottom);
+    const QMargins margins = view.contentsMargins();
+    view.resize(200 + margins.left() + margins.right(), 200 + margins.top() + margins.bottom());
     toplevel.show();
     QVERIFY(QTest::qWaitForWindowExposed(&toplevel));
 
diff --git a/tests/auto/widgets/graphicsview/qgraphicswidget/tst_qgraphicswidget.cpp b/tests/auto/widgets/graphicsview/qgraphicswidget/tst_qgraphicswidget.cpp
index 85b42e54fe..d3477be986 100644
--- a/tests/auto/widgets/graphicsview/qgraphicswidget/tst_qgraphicswidget.cpp
+++ b/tests/auto/widgets/graphicsview/qgraphicswidget/tst_qgraphicswidget.cpp
@@ -2905,7 +2905,7 @@ public:
         Q_UNUSED(widget);
         qreal w = rect().width();
         QRectF box(0, 0, w, 2400/w);
-        painter->drawRoundRect(box);
+        painter->drawRoundedRect(box, 25, 25, Qt::RelativeSize);
         painter->drawLine(box.topLeft(), box.bottomRight());
         painter->drawLine(box.bottomLeft(), box.topRight());
     }
diff --git a/tests/auto/widgets/itemviews/qcolumnview/BLACKLIST b/tests/auto/widgets/itemviews/qcolumnview/BLACKLIST
deleted file mode 100644
index bda01c700c..0000000000
--- a/tests/auto/widgets/itemviews/qcolumnview/BLACKLIST
+++ /dev/null
@@ -1,2 +0,0 @@
-[scrollTo:reverse]
-osx
diff --git a/tests/auto/widgets/itemviews/qheaderview/BLACKLIST b/tests/auto/widgets/itemviews/qheaderview/BLACKLIST
index efb813f7d2..297a6fe7b7 100644
--- a/tests/auto/widgets/itemviews/qheaderview/BLACKLIST
+++ b/tests/auto/widgets/itemviews/qheaderview/BLACKLIST
@@ -1,3 +1,3 @@
 [stretchAndRestoreLastSection]
-opensuse
 opensuse-leap
+opensuse-42.3
diff --git a/tests/auto/widgets/itemviews/qlistview/tst_qlistview.cpp b/tests/auto/widgets/itemviews/qlistview/tst_qlistview.cpp
index 0b828b8484..3a60b3b7c6 100644
--- a/tests/auto/widgets/itemviews/qlistview/tst_qlistview.cpp
+++ b/tests/auto/widgets/itemviews/qlistview/tst_qlistview.cpp
@@ -2516,9 +2516,9 @@ void tst_QListView::horizontalScrollingByVerticalWheelEvents()
     QPoint globalPos = lv.geometry().center();
     QPoint pos = lv.viewport()->geometry().center();
 
-    QWheelEvent wheelDownEvent(pos, globalPos, QPoint(0, 0), QPoint(0, -120), -120, Qt::Vertical, 0, 0);
-    QWheelEvent wheelUpEvent(pos, globalPos, QPoint(0, 0), QPoint(0, 120), 120, Qt::Vertical, 0, 0);
-    QWheelEvent wheelLeftDownEvent(pos, globalPos, QPoint(0, 0), QPoint(120, -120), -120, Qt::Vertical, 0, 0);
+    QWheelEvent wheelDownEvent(pos, globalPos, QPoint(0, 0), QPoint(0, -120), Qt::NoButton, Qt::NoModifier, Qt::NoScrollPhase, false);
+    QWheelEvent wheelUpEvent(pos, globalPos, QPoint(0, 0), QPoint(0, 120), Qt::NoButton, Qt::NoModifier, Qt::NoScrollPhase, false);
+    QWheelEvent wheelLeftDownEvent(pos, globalPos, QPoint(0, 0), QPoint(120, -120), Qt::NoButton, Qt::NoModifier, Qt::NoScrollPhase, false);
 
     int hValue = lv.horizontalScrollBar()->value();
     QApplication::sendEvent(lv.viewport(), &wheelDownEvent);
diff --git a/tests/auto/widgets/itemviews/qtableview/BLACKLIST b/tests/auto/widgets/itemviews/qtableview/BLACKLIST
index be90475a6f..9648cef3de 100644
--- a/tests/auto/widgets/itemviews/qtableview/BLACKLIST
+++ b/tests/auto/widgets/itemviews/qtableview/BLACKLIST
@@ -1,4 +1,3 @@
 [moveCursorBiggerJump]
 osx
-[columnViewportPosition]
-winrt # QTBUG-72853
+
diff --git a/tests/auto/widgets/itemviews/qtableview/tst_qtableview.cpp b/tests/auto/widgets/itemviews/qtableview/tst_qtableview.cpp
index bf87408056..6bbb30a6db 100644
--- a/tests/auto/widgets/itemviews/qtableview/tst_qtableview.cpp
+++ b/tests/auto/widgets/itemviews/qtableview/tst_qtableview.cpp
@@ -4074,8 +4074,10 @@ void tst_QTableView::mouseWheel()
     view.verticalScrollBar()->setValue(10);
 
     QPoint pos = view.viewport()->geometry().center();
-    QWheelEvent verticalEvent(pos, delta, 0, 0, Qt::Vertical);
-    QWheelEvent horizontalEvent(pos, delta, 0, 0, Qt::Horizontal);
+    QWheelEvent verticalEvent(pos, view.mapToGlobal(pos), QPoint(), QPoint(0, delta),
+                              Qt::NoButton, Qt::NoModifier, Qt::NoScrollPhase, false);
+    QWheelEvent horizontalEvent(pos, view.mapToGlobal(pos), QPoint(), QPoint(delta, 0),
+                                Qt::NoButton, Qt::NoModifier, Qt::NoScrollPhase, false);
     QApplication::sendEvent(view.viewport(), &horizontalEvent);
     QVERIFY(qAbs(view.horizontalScrollBar()->value() - horizontalPositon) < 15);
     QApplication::sendEvent(view.viewport(), &verticalEvent);
@@ -4350,7 +4352,9 @@ void tst_QTableView::taskQTBUG_5237_wheelEventOnHeader()
     int sbValueBefore = view.verticalScrollBar()->value();
     QHeaderView *header = view.verticalHeader();
     QTest::mouseMove(header);
-    QWheelEvent wheelEvent(header->geometry().center(), -720, 0, 0);
+    QPoint pos = header->geometry().center();
+    QWheelEvent wheelEvent(pos, header->viewport()->mapToGlobal(pos), QPoint(), QPoint(0, -720),
+                           Qt::NoButton, Qt::NoModifier, Qt::NoScrollPhase, false);
     QApplication::sendEvent(header->viewport(), &wheelEvent);
     int sbValueAfter = view.verticalScrollBar()->value();
     QVERIFY(sbValueBefore != sbValueAfter);
diff --git a/tests/auto/widgets/kernel/qapplication/BLACKLIST b/tests/auto/widgets/kernel/qapplication/BLACKLIST
index d7de7bf16e..ac65a97c40 100644
--- a/tests/auto/widgets/kernel/qapplication/BLACKLIST
+++ b/tests/auto/widgets/kernel/qapplication/BLACKLIST
@@ -1,4 +1,4 @@
 [touchEventPropagation]
-# QTBUG-66745
-opensuse
 opensuse-leap
+# QTBUG-66745
+opensuse-42.3
diff --git a/tests/auto/widgets/kernel/qboxlayout/tst_qboxlayout.cpp b/tests/auto/widgets/kernel/qboxlayout/tst_qboxlayout.cpp
index 8dd9d7c428..00bde3cb25 100644
--- a/tests/auto/widgets/kernel/qboxlayout/tst_qboxlayout.cpp
+++ b/tests/auto/widgets/kernel/qboxlayout/tst_qboxlayout.cpp
@@ -194,7 +194,7 @@ void tst_QBoxLayout::setGeometry()
     setFrameless(&toplevel);
     QWidget w(&toplevel);
     QVBoxLayout *lay = new QVBoxLayout;
-    lay->setMargin(0);
+    lay->setContentsMargins(0, 0, 0, 0);
     lay->setSpacing(0);
     QHBoxLayout *lay2 = new QHBoxLayout;
     QDial *dial = new QDial;
@@ -271,7 +271,7 @@ void tst_QBoxLayout::widgetSurplus()
     QDialog window;
     QScopedPointer<MarginEatingStyle> marginEater(new MarginEatingStyle);
     QVBoxLayout *vbox = new QVBoxLayout(&window);
-    vbox->setMargin(0);
+    vbox->setContentsMargins(0, 0, 0, 0);
     vbox->setSpacing(0);
 
     QLabel *hiddenLabel = new QLabel(tr("Invisible label"));
diff --git a/tests/auto/widgets/kernel/qgridlayout/tst_qgridlayout.cpp b/tests/auto/widgets/kernel/qgridlayout/tst_qgridlayout.cpp
index 5e0327319b..1d63d140fb 100644
--- a/tests/auto/widgets/kernel/qgridlayout/tst_qgridlayout.cpp
+++ b/tests/auto/widgets/kernel/qgridlayout/tst_qgridlayout.cpp
@@ -219,9 +219,9 @@ void tst_QGridLayout::badDistributionBug()
     QDialog dialog;
     Ui::SortDialog ui;
     ui.setupUi(&dialog);
-    ui.gridLayout->setMargin(0);
+    ui.gridLayout->setContentsMargins(0, 0, 0, 0);
     ui.gridLayout->setSpacing(0);
-    ui.vboxLayout->setMargin(0);
+    ui.vboxLayout->setContentsMargins(0, 0, 0, 0);
     ui.vboxLayout->setSpacing(0);
     ui.okButton->setFixedHeight(20);
     ui.moreButton->setFixedHeight(20);
@@ -237,7 +237,7 @@ void tst_QGridLayout::setMinAndMaxSize()
     QWidget widget;
     setFrameless(&widget);
     QGridLayout layout(&widget);
-    layout.setMargin(0);
+    layout.setContentsMargins(0, 0, 0, 0);
     layout.setSpacing(0);
     layout.setSizeConstraint(QLayout::SetMinAndMaxSize);
     widget.show();
@@ -396,7 +396,7 @@ void tst_QGridLayout::spacingAndSpacers()
     QWidget widget;
     setFrameless(&widget);
     QGridLayout layout(&widget);
-    layout.setMargin(0);
+    layout.setContentsMargins(0, 0, 0, 0);
     layout.setSpacing(0);
     widget.show();
 
@@ -1541,7 +1541,7 @@ void tst_QGridLayout::spacerWithSpacing()
                 QWidget window;
                 QGridLayout layout(&window);
                 layout.setSpacing(1);
-                layout.setMargin(0);
+                layout.setContentsMargins(0, 0, 0, 0);
                 populate(&layout, 0, i);
                 populate(&layout, 1, j);
                 populate(&layout, 2, k);
@@ -1651,7 +1651,7 @@ void tst_QGridLayout::taskQTBUG_52357_spacingWhenItemIsHidden()
     QWidget widget;
     setFrameless(&widget);
     QGridLayout layout(&widget);
-    layout.setMargin(0);
+    layout.setContentsMargins(0, 0, 0, 0);
     layout.setSpacing(5);
     QPushButton button1;
     layout.addWidget(&button1, 0, 0);
diff --git a/tests/auto/widgets/kernel/qlayout/tst_qlayout.cpp b/tests/auto/widgets/kernel/qlayout/tst_qlayout.cpp
index 936f581d89..140a367afe 100644
--- a/tests/auto/widgets/kernel/qlayout/tst_qlayout.cpp
+++ b/tests/auto/widgets/kernel/qlayout/tst_qlayout.cpp
@@ -308,7 +308,7 @@ void tst_QLayout::controlTypes2()
 {
     QWidget main;
     QVBoxLayout *const layout = new QVBoxLayout(&main);
-    layout->setMargin(0);
+    layout->setContentsMargins(0, 0, 0, 0);
     QComboBox *combo = new QComboBox(&main);
     layout->addWidget(combo);
     QCOMPARE(layout->controlTypes(), QSizePolicy::ComboBox);
@@ -319,7 +319,7 @@ void tst_QLayout::adjustSizeShouldMakeSureLayoutIsActivated()
     QWidget main;
 
     QVBoxLayout *const layout = new QVBoxLayout(&main);
-    layout->setMargin(0);
+    layout->setContentsMargins(0, 0, 0, 0);
     SizeHinterFrame *frame = new SizeHinterFrame(QSize(200, 10), QSize(200, 8));
     frame->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred);
     layout->addWidget(frame);
diff --git a/tests/auto/widgets/kernel/qwidget/BLACKLIST b/tests/auto/widgets/kernel/qwidget/BLACKLIST
index 03bec4286b..02e97e4b4e 100644
--- a/tests/auto/widgets/kernel/qwidget/BLACKLIST
+++ b/tests/auto/widgets/kernel/qwidget/BLACKLIST
@@ -2,30 +2,34 @@
 [normalGeometry]
 ubuntu-16.04
 [saveRestoreGeometry]
-xcb
+opensuse-leap
+ubuntu-16.04
 b2qt
+opensuse-42.3
 [restoreVersion1Geometry]
-osx
-[updateWhileMinimized]
 ubuntu-16.04
+[updateWhileMinimized]
 ubuntu-18.04
 rhel-7.4
+ubuntu-16.04
 rhel-7.6
-osx
 [focusProxyAndInputMethods]
-linux
+ubuntu-16.04
+rhel-7.6
+opensuse-leap
+ubuntu-18.04
+rhel-7.4
+opensuse-42.3
 [raise]
-# QTBUG-68175
-opensuse
 opensuse-leap
-[setWindowGeometry]
-osx
-[windowMoveResize]
-osx
+# QTBUG-68175
+opensuse-42.3
 [childEvents]
 osx ci
 [renderInvisible]
-osx
+osx-10.12
+osx-10.11
+osx-10.14
 [optimizedResizeMove]
 osx
 [optimizedResize_topLevel]
@@ -40,12 +44,14 @@ opensuse
 opensuse-leap
 [moveInResizeEvent]
 ubuntu-16.04
-[moveChild:right]
-osx
-[activateWindow]
-osx-10.12 ci
 [multipleToplevelFocusCheck]
-linux
+ubuntu-16.04
+rhel-7.6
+opensuse-leap
+ubuntu-18.04
+rhel-7.4
+opensuse-42.3
 [windowState]
 # QTBUG-75270
 winrt
+
diff --git a/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp b/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp
index 103be88f86..bfc2631842 100644
--- a/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp
+++ b/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp
@@ -182,6 +182,8 @@ private slots:
     void tabOrderWithCompoundWidgets();
     void tabOrderNoChange();
     void tabOrderNoChange2();
+    void appFocusWidgetWithFocusProxyLater();
+    void appFocusWidgetWhenLosingFocusProxy();
 #if defined(Q_OS_WIN) && !defined(Q_OS_WINRT)
     void activation();
 #endif
@@ -2032,6 +2034,51 @@ void tst_QWidget::tabOrderNoChange2()
     QCOMPARE(focusChainBackward, getFocusChain(&w, false));
 }
 
+void tst_QWidget::appFocusWidgetWithFocusProxyLater()
+{
+    // Given a lineedit without a focus proxy
+    QWidget window;
+    window.setWindowTitle(QTest::currentTestFunction());
+    QLineEdit *lineEditFocusProxy = new QLineEdit(&window);
+    QLineEdit *lineEdit = new QLineEdit(&window);
+    lineEdit->setFocus();
+    window.show();
+    QApplication::setActiveWindow(&window);
+    QVERIFY(QTest::qWaitForWindowActive(&window));
+    QCOMPARE(QApplication::focusWidget(), lineEdit);
+
+    // When setting a focus proxy for the focus widget (like QWebEngineView does)
+    lineEdit->setFocusProxy(lineEditFocusProxy);
+
+    // Then the focus widget should be updated
+    QCOMPARE(QApplication::focusWidget(), lineEditFocusProxy);
+
+    // So that deleting the lineEdit and later the window, doesn't crash
+    delete lineEdit;
+    QCOMPARE(QApplication::focusWidget(), nullptr);
+}
+
+void tst_QWidget::appFocusWidgetWhenLosingFocusProxy()
+{
+    // Given a lineedit with a focus proxy
+    QWidget window;
+    window.setWindowTitle(QTest::currentTestFunction());
+    QLineEdit *lineEditFocusProxy = new QLineEdit(&window);
+    QLineEdit *lineEdit = new QLineEdit(&window);
+    lineEdit->setFocusProxy(lineEditFocusProxy);
+    lineEdit->setFocus();
+    window.show();
+    QApplication::setActiveWindow(&window);
+    QVERIFY(QTest::qWaitForWindowActive(&window));
+    QCOMPARE(QApplication::focusWidget(), lineEditFocusProxy);
+
+    // When unsetting the focus proxy
+    lineEdit->setFocusProxy(nullptr);
+
+    // Then the application focus widget should be back to the lineedit
+    QCOMPARE(QApplication::focusWidget(), lineEdit);
+}
+
 #if defined(Q_OS_WIN) && !defined(Q_OS_WINRT)
 void tst_QWidget::activation()
 {
@@ -6142,7 +6189,7 @@ void tst_QWidget::minAndMaxSizeWithX11BypassWindowManagerHint()
 {
     if (m_platform != QStringLiteral("xcb"))
         QSKIP("This test is for X11 only.");
-    // Same size as in QWidget::create_sys().
+    // Same size as in QWidgetPrivate::create.
     const QSize desktopSize = QApplication::desktop()->size();
     const QSize originalSize(desktopSize.width() / 2, desktopSize.height() * 4 / 10);
 
@@ -8026,7 +8073,7 @@ public:
             sp.setHeightForWidth(hfwLayout);
 
             QVBoxLayout *vbox = new QVBoxLayout;
-            vbox->setMargin(0);
+            vbox->setContentsMargins(0, 0, 0, 0);
             vbox->addWidget(new ASWidget(sizeHint + QSize(30, 20), sp, false, false));
             setLayout(vbox);
         }
@@ -9425,7 +9472,7 @@ void tst_QWidget::initialPosForDontShowOnScreenWidgets()
         const QPoint expectedPos(0, 0);
         QWidget widget;
         widget.setAttribute(Qt::WA_DontShowOnScreen);
-        widget.winId(); // Make sure create_sys is called.
+        widget.winId(); // Make sure QWidgetPrivate::create is called.
         QCOMPARE(widget.pos(), expectedPos);
         QCOMPARE(widget.geometry().topLeft(), expectedPos);
     }
@@ -9435,7 +9482,7 @@ void tst_QWidget::initialPosForDontShowOnScreenWidgets()
         QWidget widget;
         widget.setAttribute(Qt::WA_DontShowOnScreen);
         widget.move(expectedPos);
-        widget.winId(); // Make sure create_sys is called.
+        widget.winId(); // Make sure QWidgetPrivate::create is called.
         QCOMPARE(widget.pos(), expectedPos);
         QCOMPARE(widget.geometry().topLeft(), expectedPos);
     }
@@ -10073,7 +10120,7 @@ void tst_QWidget::grabMouse()
     w.setObjectName(QLatin1String("tst_qwidget_grabMouse"));
     w.setWindowTitle(w.objectName());
     QLayout *layout = new QVBoxLayout(&w);
-    layout->setMargin(50);
+    layout->setContentsMargins(50, 50, 50, 50);
     GrabLoggerWidget *grabber = new GrabLoggerWidget(&log, &w);
     const QString grabberObjectName = QLatin1String("tst_qwidget_grabMouse_grabber");
     grabber->setObjectName(grabberObjectName);
diff --git a/tests/auto/widgets/kernel/qwidget_window/BLACKLIST b/tests/auto/widgets/kernel/qwidget_window/BLACKLIST
index 381cf76c46..39d7b695f6 100644
--- a/tests/auto/widgets/kernel/qwidget_window/BLACKLIST
+++ b/tests/auto/widgets/kernel/qwidget_window/BLACKLIST
@@ -4,4 +4,5 @@ opensuse-42.3
 ubuntu-16.04
 [setWindowState]
 ubuntu-18.04
-rhel
+rhel-7.6
+
diff --git a/tests/auto/widgets/util/qcompleter/BLACKLIST b/tests/auto/widgets/util/qcompleter/BLACKLIST
index fdc424b6ac..367270fdf2 100644
--- a/tests/auto/widgets/util/qcompleter/BLACKLIST
+++ b/tests/auto/widgets/util/qcompleter/BLACKLIST
@@ -1,2 +1,6 @@
 [QTBUG_14292_filesystem]
-linux
+ubuntu-16.04
+opensuse-leap
+rhel-7.4
+rhel-6.6
+opensuse-42.3
diff --git a/tests/auto/widgets/widgets/qabstractslider/tst_qabstractslider.cpp b/tests/auto/widgets/widgets/qabstractslider/tst_qabstractslider.cpp
index d8fbb8e041..f77efe036a 100644
--- a/tests/auto/widgets/widgets/qabstractslider/tst_qabstractslider.cpp
+++ b/tests/auto/widgets/widgets/qabstractslider/tst_qabstractslider.cpp
@@ -1662,8 +1662,12 @@ void tst_QAbstractSlider::wheelEvent()
     slider->setOrientation(sliderOrientation);
 
     Qt::KeyboardModifier k = withModifiers ? Qt::ControlModifier : Qt::NoModifier;
-    QWheelEvent event(slider->rect().bottomRight() + distanceFromBottomRight, WHEEL_DELTA * deltaMultiple,
-                      Qt::NoButton, k, wheelOrientation);
+
+    const QPoint wheelPoint = slider->rect().bottomRight() + distanceFromBottomRight;
+    const QPoint angleDelta(wheelOrientation == Qt::Horizontal ? WHEEL_DELTA * deltaMultiple : 0,
+                            wheelOrientation == Qt::Vertical ? WHEEL_DELTA * deltaMultiple : 0);
+    QWheelEvent event(wheelPoint, slider->mapToGlobal(wheelPoint), QPoint(), angleDelta,
+                      Qt::NoButton, k, Qt::NoScrollPhase, false);
     QVERIFY(applicationInstance->sendEvent(slider,&event));
 #ifdef Q_OS_MAC
     QEXPECT_FAIL("Normal data page", "QTBUG-23679", Continue);
@@ -1674,8 +1678,8 @@ void tst_QAbstractSlider::wheelEvent()
 
     slider->setSliderPosition(initialSliderPosition);
     k = withModifiers ? Qt::ShiftModifier : Qt::NoModifier;
-    event = QWheelEvent(slider->rect().bottomRight() + distanceFromBottomRight, WHEEL_DELTA * deltaMultiple,
-                      Qt::NoButton, k, wheelOrientation);
+    event = QWheelEvent(wheelPoint, slider->mapToGlobal(wheelPoint), QPoint(), angleDelta,
+                        Qt::NoButton, k, Qt::NoScrollPhase, false);
     QSignalSpy spy1(slider, SIGNAL(actionTriggered(int)));
     QSignalSpy spy2(slider, SIGNAL(valueChanged(int)));
     QVERIFY(applicationInstance->sendEvent(slider,&event));
@@ -1715,16 +1719,16 @@ void tst_QAbstractSlider::fineGrainedWheelEvent()
     slider->setSliderPosition(0);
 
     const int singleStepDelta = invertedControls ? (-WHEEL_DELTA / 3) : (WHEEL_DELTA / 3);
-
-    QWheelEvent eventDown(slider->rect().bottomRight(), singleStepDelta / 2,
-                      Qt::NoButton, Qt::NoModifier, Qt::Vertical);
+    const QPoint wheelPoint = slider->rect().bottomRight();
+    QWheelEvent eventDown(wheelPoint, slider->mapToGlobal(wheelPoint), QPoint(), QPoint(0, singleStepDelta / 2),
+                          Qt::NoButton, Qt::NoModifier, Qt::NoScrollPhase, false);
     QVERIFY(applicationInstance->sendEvent(slider,&eventDown));
     QCOMPARE(slider->sliderPosition(), 0);
     QVERIFY(applicationInstance->sendEvent(slider,&eventDown));
     QCOMPARE(slider->sliderPosition(), 1);
 
-    QWheelEvent eventUp(slider->rect().bottomRight(), -singleStepDelta / 2,
-                        Qt::NoButton, Qt::NoModifier, Qt::Vertical);
+    QWheelEvent eventUp(wheelPoint, slider->mapToGlobal(wheelPoint), QPoint(), QPoint(0, -singleStepDelta / 2),
+                          Qt::NoButton, Qt::NoModifier, Qt::NoScrollPhase, false);
     QVERIFY(applicationInstance->sendEvent(slider,&eventUp));
     QCOMPARE(slider->sliderPosition(), 1);
     QVERIFY(applicationInstance->sendEvent(slider,&eventUp));
diff --git a/tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp b/tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp
index a576770811..4e16edaca8 100644
--- a/tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp
+++ b/tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp
@@ -254,12 +254,22 @@ void tst_QComboBox::getSetCheck()
     obj1.setMaxCount(INT_MAX);
     QCOMPARE(INT_MAX, obj1.maxCount());
 
+    // QCompleter *QComboBox::completer()
+    // void QComboBox::setCompleter(QCompleter *)
+    obj1.setCompleter(nullptr);
+    QCOMPARE(nullptr, obj1.completer());
+    QCompleter completer;
+    obj1.setCompleter(&completer);
+    QVERIFY(obj1.completer() == nullptr); // no QLineEdit is set
+
+#if QT_DEPRECATED_SINCE(5, 13)
     // bool QComboBox::autoCompletion()
     // void QComboBox::setAutoCompletion(bool)
     obj1.setAutoCompletion(false);
     QCOMPARE(false, obj1.autoCompletion());
     obj1.setAutoCompletion(true);
     QCOMPARE(true, obj1.autoCompletion());
+#endif
 
     // bool QComboBox::duplicatesEnabled()
     // void QComboBox::setDuplicatesEnabled(bool)
@@ -317,6 +327,9 @@ void tst_QComboBox::getSetCheck()
     QCOMPARE(var8, obj1.lineEdit());
     // delete var8; // No delete, since QComboBox takes ownership
 
+    // After setting a line edit, completer() should not return nullptr anymore
+    QVERIFY(obj1.completer() != nullptr);
+
     // const QValidator * QComboBox::validator()
     // void QComboBox::setValidator(const QValidator *)
     QIntValidator *var9 = new QIntValidator(0);
@@ -777,7 +790,9 @@ void tst_QComboBox::virtualAutocompletion()
     QVERIFY(QTest::qWaitForWindowExposed(&topLevel));
     QComboBox *testWidget = topLevel.comboBox();
     testWidget->clear();
+#if QT_DEPRECATED_SINCE(5, 13)
     testWidget->setAutoCompletion(true);
+#endif
     testWidget->addItem("Foo");
     testWidget->addItem("Bar");
     testWidget->addItem("Boat");
@@ -837,7 +852,9 @@ void tst_QComboBox::autoCompletionCaseSensitivity()
     QCOMPARE(qApp->focusWidget(), (QWidget *)testWidget);
 
     testWidget->clear();
+#if QT_DEPRECATED_SINCE(5, 13)
     testWidget->setAutoCompletion(true);
+#endif
     testWidget->addItem("Cow");
     testWidget->addItem("irrelevant1");
     testWidget->addItem("aww");
@@ -2102,7 +2119,9 @@ void tst_QComboBox::mouseWheel()
         box.setEditable(i==0?false:true);
         box.setCurrentIndex(startIndex);
 
-        QWheelEvent event = QWheelEvent(box.rect().bottomRight() , WHEEL_DELTA * wheelDirection, Qt::NoButton, Qt::NoModifier);
+        const QPoint wheelPoint = box.rect().bottomRight();
+        QWheelEvent event(wheelPoint, box.mapToGlobal(wheelPoint), QPoint(), QPoint(0, WHEEL_DELTA * wheelDirection),
+                              Qt::NoButton, Qt::NoModifier, Qt::NoScrollPhase, false);
         QVERIFY(applicationInstance->sendEvent(&box,&event));
 
         QCOMPARE(box.currentIndex(), expectedIndex);
@@ -2131,7 +2150,9 @@ void tst_QComboBox::popupWheelHandling()
     comboBox->showPopup();
     QTRY_VERIFY(comboBox->view() && comboBox->view()->isVisible());
     const QPoint popupPos = comboBox->view()->pos();
-    QWheelEvent event(QPointF(10, 10), WHEEL_DELTA, Qt::NoButton, Qt::NoModifier);
+    const QPoint wheelPoint(10, 10);
+    QWheelEvent event(wheelPoint, scrollArea.mapToGlobal(wheelPoint), QPoint(), QPoint(0, WHEEL_DELTA),
+                          Qt::NoButton, Qt::NoModifier, Qt::NoScrollPhase, false);
     QVERIFY(QCoreApplication::sendEvent(scrollArea.windowHandle(), &event));
     QCoreApplication::processEvents();
     QVERIFY(comboBox->view()->isVisible());
@@ -3050,7 +3071,9 @@ void tst_QComboBox::task_QTBUG_31146_popupCompletion()
 {
     QComboBox comboBox;
     comboBox.setEditable(true);
+#if QT_DEPRECATED_SINCE(5, 13)
     comboBox.setAutoCompletion(true);
+#endif
     comboBox.setInsertPolicy(QComboBox::NoInsert);
     comboBox.completer()->setCaseSensitivity(Qt::CaseInsensitive);
     comboBox.completer()->setCompletionMode(QCompleter::PopupCompletion);
diff --git a/tests/auto/widgets/widgets/qdatetimeedit/tst_qdatetimeedit.cpp b/tests/auto/widgets/widgets/qdatetimeedit/tst_qdatetimeedit.cpp
index cd045e476c..810f081b73 100644
--- a/tests/auto/widgets/widgets/qdatetimeedit/tst_qdatetimeedit.cpp
+++ b/tests/auto/widgets/widgets/qdatetimeedit/tst_qdatetimeedit.cpp
@@ -3141,7 +3141,6 @@ void tst_QDateTimeEdit::wheelEvent_data()
 {
 #if QT_CONFIG(wheelevent)
     QTest::addColumn<QPoint>("angleDelta");
-    QTest::addColumn<int>("qt4Delta");
     QTest::addColumn<int>("stepModifier");
     QTest::addColumn<Qt::KeyboardModifiers>("modifiers");
     QTest::addColumn<Qt::MouseEventSource>("source");
@@ -3255,7 +3254,6 @@ void tst_QDateTimeEdit::wheelEvent_data()
                                           modifierName.latin1(),
                                           sourceName.latin1())
                                     << angleDelta
-                                    << units
                                     << static_cast<int>(stepModifier)
                                     << modifiers
                                     << source
@@ -3277,7 +3275,6 @@ void tst_QDateTimeEdit::wheelEvent()
 {
 #if QT_CONFIG(wheelevent)
     QFETCH(QPoint, angleDelta);
-    QFETCH(int, qt4Delta);
     QFETCH(int, stepModifier);
     QFETCH(Qt::KeyboardModifiers, modifiers);
     QFETCH(Qt::MouseEventSource, source);
@@ -3294,9 +3291,8 @@ void tst_QDateTimeEdit::wheelEvent()
     style->stepModifier = static_cast<Qt::KeyboardModifier>(stepModifier);
     edit.setStyle(style.data());
 
-    QWheelEvent event(QPointF(), QPointF(), QPoint(), angleDelta, qt4Delta,
-                      Qt::Vertical, Qt::NoButton, modifiers, Qt::NoScrollPhase,
-                      source);
+    QWheelEvent event(QPointF(), QPointF(), QPoint(), angleDelta,
+                      Qt::NoButton, modifiers, Qt::NoScrollPhase, false, source);
 
     QCOMPARE(edit.date(), startDate);
     for (QDate expected : expectedDates) {
diff --git a/tests/auto/widgets/widgets/qdoublespinbox/BLACKLIST b/tests/auto/widgets/widgets/qdoublespinbox/BLACKLIST
index c1b6c9693e..8f5648d0f9 100644
--- a/tests/auto/widgets/widgets/qdoublespinbox/BLACKLIST
+++ b/tests/auto/widgets/widgets/qdoublespinbox/BLACKLIST
@@ -1,2 +1,4 @@
 [editingFinished]
-*
+osx-10.12
+osx-10.14
+osx-10.13
diff --git a/tests/auto/widgets/widgets/qdoublespinbox/tst_qdoublespinbox.cpp b/tests/auto/widgets/widgets/qdoublespinbox/tst_qdoublespinbox.cpp
index a20b5568da..c760d9cc99 100644
--- a/tests/auto/widgets/widgets/qdoublespinbox/tst_qdoublespinbox.cpp
+++ b/tests/auto/widgets/widgets/qdoublespinbox/tst_qdoublespinbox.cpp
@@ -1377,7 +1377,6 @@ void tst_QDoubleSpinBox::wheelEvents_data()
 {
 #if QT_CONFIG(wheelevent)
     QTest::addColumn<QPoint>("angleDelta");
-    QTest::addColumn<int>("qt4Delta");
     QTest::addColumn<int>("stepModifier");
     QTest::addColumn<Qt::KeyboardModifiers>("modifier");
     QTest::addColumn<Qt::MouseEventSource>("source");
@@ -1476,7 +1475,6 @@ void tst_QDoubleSpinBox::wheelEvents_data()
                                       modifierName.latin1(),
                                       sourceName.latin1())
                                 << angleDelta
-                                << units
                                 << static_cast<int>(stepModifier)
                                 << modifiers
                                 << source
@@ -1496,7 +1494,6 @@ void tst_QDoubleSpinBox::wheelEvents()
 {
 #if QT_CONFIG(wheelevent)
     QFETCH(QPoint, angleDelta);
-    QFETCH(int, qt4Delta);
     QFETCH(int, stepModifier);
     QFETCH(Qt::KeyboardModifiers, modifier);
     QFETCH(Qt::MouseEventSource, source);
@@ -1512,9 +1509,8 @@ void tst_QDoubleSpinBox::wheelEvents()
     style->stepModifier = static_cast<Qt::KeyboardModifier>(stepModifier);
     spinBox.setStyle(style.data());
 
-    QWheelEvent event(QPointF(), QPointF(), QPoint(), angleDelta, qt4Delta,
-                      Qt::Vertical, Qt::NoButton, modifier, Qt::NoScrollPhase,
-                      source);
+    QWheelEvent event(QPointF(), QPointF(), QPoint(), angleDelta,
+                      Qt::NoButton, modifier, Qt::NoScrollPhase, false, source);
     for (int expected : expectedValues) {
         qApp->sendEvent(&spinBox, &event);
         QCOMPARE(spinBox.value(), expected);
diff --git a/tests/auto/widgets/widgets/qlabel/tst_qlabel.cpp b/tests/auto/widgets/widgets/qlabel/tst_qlabel.cpp
index 34862f6810..f599ac73c6 100644
--- a/tests/auto/widgets/widgets/qlabel/tst_qlabel.cpp
+++ b/tests/auto/widgets/widgets/qlabel/tst_qlabel.cpp
@@ -461,7 +461,7 @@ void tst_QLabel::unicodeText()
     QVBoxLayout *layout = new QVBoxLayout();
     QLabel *label = new QLabel(text, &frame);
     layout->addWidget(label);
-    layout->setMargin(8);
+    layout->setContentsMargins(8, 8, 8, 8);
     frame.setLayout(layout);
     frame.show();
     QVERIFY(QTest::qWaitForWindowExposed(&frame));
diff --git a/tests/auto/widgets/widgets/qlineedit/tst_qlineedit.cpp b/tests/auto/widgets/widgets/qlineedit/tst_qlineedit.cpp
index f1bc3e8dd4..1c68a5f752 100644
--- a/tests/auto/widgets/widgets/qlineedit/tst_qlineedit.cpp
+++ b/tests/auto/widgets/widgets/qlineedit/tst_qlineedit.cpp
@@ -3530,6 +3530,13 @@ void tst_QLineEdit::textMargin()
     centerOnScreen(&tlw);
     tlw.show();
 
+    const QMargins margins = testWidget.textMargins();
+    QCOMPARE(left, margins.left());
+    QCOMPARE(top, margins.top());
+    QCOMPARE(right, margins.right());
+    QCOMPARE(bottom, margins.bottom());
+
+#if QT_DEPRECATED_SINCE(5, 14)
     int l;
     int t;
     int r;
@@ -3539,6 +3546,7 @@ void tst_QLineEdit::textMargin()
     QCOMPARE(top, t);
     QCOMPARE(right, r);
     QCOMPARE(bottom, b);
+#endif
 
     QTest::mouseClick(&testWidget, Qt::LeftButton, 0, mousePressPos);
     QTRY_COMPARE(testWidget.cursorPosition(), cursorPosition);
diff --git a/tests/auto/widgets/widgets/qmdiarea/BLACKLIST b/tests/auto/widgets/widgets/qmdiarea/BLACKLIST
index b1c8d7dfde..1dd876ea97 100644
--- a/tests/auto/widgets/widgets/qmdiarea/BLACKLIST
+++ b/tests/auto/widgets/widgets/qmdiarea/BLACKLIST
@@ -1,7 +1,16 @@
-[updateScrollBars]
-osx
 [tileSubWindows]
-osx
-xcb
+ubuntu-16.04
+rhel-7.6
+opensuse-leap
+osx-10.11
+osx-10.13
+ubuntu-18.04
+osx-10.14
+rhel-7.4
+osx-10.12
+opensuse-42.3
 [resizeTimer]
-osx
+osx-10.12
+osx-10.14
+osx-10.13
+
diff --git a/tests/auto/widgets/widgets/qmdiarea/tst_qmdiarea.cpp b/tests/auto/widgets/widgets/qmdiarea/tst_qmdiarea.cpp
index 046899ce05..b8abd78657 100644
--- a/tests/auto/widgets/widgets/qmdiarea/tst_qmdiarea.cpp
+++ b/tests/auto/widgets/widgets/qmdiarea/tst_qmdiarea.cpp
@@ -880,7 +880,7 @@ void tst_QMdiArea::minimumSizeHint()
 {
     QMdiArea workspace;
     workspace.show();
-    QSize expectedSize(workspace.style()->pixelMetric(QStyle::PM_MDIMinimizedWidth),
+    QSize expectedSize(workspace.style()->pixelMetric(QStyle::PM_MdiSubWindowMinimizedWidth),
                        workspace.style()->pixelMetric(QStyle::PM_TitleBarHeight));
     qApp->processEvents();
     QAbstractScrollArea dummyScrollArea;
diff --git a/tests/auto/widgets/widgets/qmdisubwindow/BLACKLIST b/tests/auto/widgets/widgets/qmdisubwindow/BLACKLIST
deleted file mode 100644
index 26d1776b0d..0000000000
--- a/tests/auto/widgets/widgets/qmdisubwindow/BLACKLIST
+++ /dev/null
@@ -1,2 +0,0 @@
-[setOpaqueResizeAndMove]
-osx-10.12
diff --git a/tests/auto/widgets/widgets/qmdisubwindow/tst_qmdisubwindow.cpp b/tests/auto/widgets/widgets/qmdisubwindow/tst_qmdisubwindow.cpp
index 2b59a227b3..b8891fab95 100644
--- a/tests/auto/widgets/widgets/qmdisubwindow/tst_qmdisubwindow.cpp
+++ b/tests/auto/widgets/widgets/qmdisubwindow/tst_qmdisubwindow.cpp
@@ -613,7 +613,7 @@ void tst_QMdiSubWindow::showShaded()
 
     // Calculate mouse position for bottom right corner and simulate a
     // vertical resize with the mouse.
-    int offset = window->style()->pixelMetric(QStyle::PM_MDIFrameWidth) / 2;
+    int offset = window->style()->pixelMetric(QStyle::PM_MdiSubWindowFrameWidth) / 2;
     QPoint mousePosition(window->width() - qMax(offset, 2), window->height() - qMax(offset, 2));
     QWidget *mouseReceiver = nullptr;
 #ifdef Q_OS_MAC
@@ -759,7 +759,7 @@ void tst_QMdiSubWindow::setOpaqueResizeAndMove()
     QTRY_COMPARE(priv->resizeTimerId, -1);
 
     // Enter resize mode.
-    int offset = window->style()->pixelMetric(QStyle::PM_MDIFrameWidth) / 2;
+    int offset = window->style()->pixelMetric(QStyle::PM_MdiSubWindowFrameWidth) / 2;
     QPoint mousePosition(mouseReceiver->width() - qMax(offset, 2), mouseReceiver->height() - qMax(offset, 2));
     sendMouseMove(mouseReceiver, mousePosition, Qt::NoButton);
     sendMousePress(mouseReceiver, mousePosition);
@@ -1762,7 +1762,8 @@ void tst_QMdiSubWindow::fixedMinMaxSize()
     int minimizedHeight = subWindow->style()->pixelMetric(QStyle::PM_TitleBarHeight, &options);
     if (!subWindow->style()->styleHint(QStyle::SH_TitleBar_NoBorder, &options, subWindow))
         minimizedHeight += 8;
-    int minimizedWidth = subWindow->style()->pixelMetric(QStyle::PM_MDIMinimizedWidth, &options);
+    int minimizedWidth = subWindow->style()->pixelMetric(QStyle::PM_MdiSubWindowMinimizedWidth,
+                                                         &options);
     const QSize minimizedSize = QSize(minimizedWidth, minimizedHeight);
 
     // Even though the sub window has a minimum size set, it should be possible
diff --git a/tests/auto/widgets/widgets/qmenu/BLACKLIST b/tests/auto/widgets/widgets/qmenu/BLACKLIST
index bac14ea225..ad6d2f340c 100644
--- a/tests/auto/widgets/widgets/qmenu/BLACKLIST
+++ b/tests/auto/widgets/widgets/qmenu/BLACKLIST
@@ -1,13 +1,13 @@
 [task258920_mouseBorder]
-osx
-[submenuTearOffDontClose]
-osx-10.12 ci
+osx-10.14
+osx-10.13
 [layoutDirection]
+osx-10.12
+osx-10.13
 # Fails when enabling synchronous expose events QTBUG-62092
-osx ci
 [pushButtonPopulateOnAboutToShow]
-osx
+osx-10.13
 [tearOff]
-osx
+osx-10.14
 [activeSubMenuPosition]
 winrt
diff --git a/tests/auto/widgets/widgets/qmenu/tst_qmenu.cpp b/tests/auto/widgets/widgets/qmenu/tst_qmenu.cpp
index 3bfbe754ef..9c40c0bd57 100644
--- a/tests/auto/widgets/widgets/qmenu/tst_qmenu.cpp
+++ b/tests/auto/widgets/widgets/qmenu/tst_qmenu.cpp
@@ -610,7 +610,7 @@ void tst_QMenu::widgetActionFocus()
 
 static QMenu *getTornOffMenu()
 {
-    foreach (QWidget *w, QApplication::allWidgets()) {
+    for (QWidget *w : QApplication::allWidgets()) {
         if (w->isVisible() && w->inherits("QTornOffMenu"))
             return static_cast<QMenu *>(w);
     }
@@ -948,30 +948,28 @@ void tst_QMenu::menuSizeHint()
 {
     QMenu menu;
     //this is a list of arbitrary strings so that we check the geometry
-    QStringList list = QStringList() << "trer" << "ezrfgtgvqd" << "sdgzgzerzerzer" << "eerzertz"  << "er";
-    foreach (QString str, list)
+    for (auto str : {"trer", "ezrfgtgvqd", "sdgzgzerzerzer", "eerzertz", "er"})
         menu.addAction(str);
 
-    int left, top, right, bottom;
-    menu.getContentsMargins(&left, &top, &right, &bottom);
+    const QMargins cm = menu.contentsMargins();
     const int panelWidth = menu.style()->pixelMetric(QStyle::PM_MenuPanelWidth, 0, &menu);
     const int hmargin = menu.style()->pixelMetric(QStyle::PM_MenuHMargin, 0, &menu),
     vmargin = menu.style()->pixelMetric(QStyle::PM_MenuVMargin, 0, &menu);
 
     int maxWidth =0;
     QRect result;
-    foreach (QAction *action, menu.actions()) {
+    for (QAction *action : menu.actions()) {
         maxWidth = qMax(maxWidth, menu.actionGeometry(action).width());
         result |= menu.actionGeometry(action);
-        QCOMPARE(result.x(), left + hmargin + panelWidth);
-        QCOMPARE(result.y(), top + vmargin + panelWidth);
+        QCOMPARE(result.x(), cm.left() + hmargin + panelWidth);
+        QCOMPARE(result.y(), cm.top() + vmargin + panelWidth);
     }
 
     QStyleOption opt(0);
     opt.rect = menu.rect();
     opt.state = QStyle::State_None;
 
-    QSize resSize = QSize(result.x(), result.y()) + result.size() + QSize(hmargin + right + panelWidth, vmargin + top + panelWidth);
+    QSize resSize = QSize(result.x(), result.y()) + result.size() + QSize(hmargin + cm.right() + panelWidth, vmargin + cm.top() + panelWidth);
 
     resSize = menu.style()->sizeFromContents(QStyle::CT_Menu, &opt,
                                     resSize.expandedTo(QApplication::globalStrut()), &menu);
@@ -1572,8 +1570,7 @@ void tst_QMenu::menuSize_Scrolling()
 
             int hmargin = style()->pixelMetric(QStyle::PM_MenuHMargin, nullptr, this);
             int fw = style()->pixelMetric(QStyle::PM_MenuPanelWidth, nullptr, this);
-            int leftMargin, topMargin, rightMargin, bottomMargin;
-            getContentsMargins(&leftMargin, &topMargin, &rightMargin, &bottomMargin);
+            const QMargins cm = contentsMargins();
             QRect lastItem = actionGeometry(actions().at(actions().length() - 1));
             QSize s = size();
 #ifdef Q_OS_WINRT
@@ -1586,7 +1583,7 @@ void tst_QMenu::menuSize_Scrolling()
                 return;
             }
 
-            QCOMPARE( s.width(), lastItem.right() + fw + hmargin + rightMargin + 1);
+            QCOMPARE( s.width(), lastItem.right() + fw + hmargin + cm.right() + 1);
             QMenu::showEvent(e);
         }
 
diff --git a/tests/auto/widgets/widgets/qmenubar/BLACKLIST b/tests/auto/widgets/widgets/qmenubar/BLACKLIST
index f897797f00..c9e15e531c 100644
--- a/tests/auto/widgets/widgets/qmenubar/BLACKLIST
+++ b/tests/auto/widgets/widgets/qmenubar/BLACKLIST
@@ -3,6 +3,6 @@ ubuntu-16.04
 #QTBUG-66255
 ubuntu-18.04
 [activatedCount]
-*
+opensuse-42.3
 [QTBUG_65488_hiddenActionTriggered]
 winrt
diff --git a/tests/auto/widgets/widgets/qopenglwidget/BLACKLIST b/tests/auto/widgets/widgets/qopenglwidget/BLACKLIST
index b67c8354e8..b281eca3bf 100644
--- a/tests/auto/widgets/widgets/qopenglwidget/BLACKLIST
+++ b/tests/auto/widgets/widgets/qopenglwidget/BLACKLIST
@@ -1,5 +1,3 @@
-[clearAndGrab]
-ubuntu
-
 [stackWidgetOpaqueChildIsVisible]
-windows
+windows-10 msvc-2017
+
diff --git a/tests/auto/widgets/widgets/qscrollbar/BLACKLIST b/tests/auto/widgets/widgets/qscrollbar/BLACKLIST
deleted file mode 100644
index 277ae4d260..0000000000
--- a/tests/auto/widgets/widgets/qscrollbar/BLACKLIST
+++ /dev/null
@@ -1,3 +0,0 @@
-#QTBUG-66321
-[QTBUG_42871]
-macos
diff --git a/tests/auto/widgets/widgets/qscrollbar/tst_qscrollbar.cpp b/tests/auto/widgets/widgets/qscrollbar/tst_qscrollbar.cpp
index 278f5cdd68..339ff293f4 100644
--- a/tests/auto/widgets/widgets/qscrollbar/tst_qscrollbar.cpp
+++ b/tests/auto/widgets/widgets/qscrollbar/tst_qscrollbar.cpp
@@ -151,8 +151,11 @@ void tst_QScrollBar::QTBUG_27308()
 
     testWidget.setValue(testWidget.minimum());
     testWidget.setEnabled(false);
-    QWheelEvent event(testWidget.rect().center(),
-                      -WHEEL_DELTA, Qt::NoButton, Qt::NoModifier, testWidget.orientation());
+    const QPoint wheelPoint = testWidget.rect().center();
+    const QPoint angleDelta(testWidget.orientation() == Qt::Horizontal ? -WHEEL_DELTA : 0,
+                            testWidget.orientation() == Qt::Vertical ? -WHEEL_DELTA : 0);
+    QWheelEvent event(wheelPoint, testWidget.mapToGlobal(wheelPoint), QPoint(), angleDelta,
+                      Qt::NoButton, Qt::NoModifier, Qt::NoScrollPhase, false);
     qApp->sendEvent(&testWidget, &event);
     QCOMPARE(testWidget.value(), testWidget.minimum());
 }
diff --git a/tests/auto/widgets/widgets/qspinbox/BLACKLIST b/tests/auto/widgets/widgets/qspinbox/BLACKLIST
index a38511bfb4..96a7732165 100644
--- a/tests/auto/widgets/widgets/qspinbox/BLACKLIST
+++ b/tests/auto/widgets/widgets/qspinbox/BLACKLIST
@@ -1,3 +1,2 @@
 [stepModifierPressAndHold]
-opensuse ci # QTBUG-69492
-opensuse-leap ci
+opensuse-42.3
diff --git a/tests/auto/widgets/widgets/qspinbox/tst_qspinbox.cpp b/tests/auto/widgets/widgets/qspinbox/tst_qspinbox.cpp
index 3dd29b0214..d75e701d1c 100644
--- a/tests/auto/widgets/widgets/qspinbox/tst_qspinbox.cpp
+++ b/tests/auto/widgets/widgets/qspinbox/tst_qspinbox.cpp
@@ -1331,7 +1331,6 @@ void tst_QSpinBox::wheelEvents_data()
 {
 #if QT_CONFIG(wheelevent)
     QTest::addColumn<QPoint>("angleDelta");
-    QTest::addColumn<int>("qt4Delta");
     QTest::addColumn<int>("stepModifier");
     QTest::addColumn<Qt::KeyboardModifiers>("modifier");
     QTest::addColumn<Qt::MouseEventSource>("source");
@@ -1430,7 +1429,6 @@ void tst_QSpinBox::wheelEvents_data()
                                       modifierName.latin1(),
                                       sourceName.latin1())
                                 << angleDelta
-                                << units
                                 << static_cast<int>(stepModifier)
                                 << modifiers
                                 << source
@@ -1450,7 +1448,6 @@ void tst_QSpinBox::wheelEvents()
 {
 #if QT_CONFIG(wheelevent)
     QFETCH(QPoint, angleDelta);
-    QFETCH(int, qt4Delta);
     QFETCH(int, stepModifier);
     QFETCH(Qt::KeyboardModifiers, modifier);
     QFETCH(Qt::MouseEventSource, source);
@@ -1466,9 +1463,8 @@ void tst_QSpinBox::wheelEvents()
     style->stepModifier = static_cast<Qt::KeyboardModifier>(stepModifier);
     spinBox.setStyle(style.data());
 
-    QWheelEvent event(QPointF(), QPointF(), QPoint(), angleDelta, qt4Delta,
-                      Qt::Vertical, Qt::NoButton, modifier, Qt::NoScrollPhase,
-                      source);
+    QWheelEvent event(QPointF(), QPointF(), QPoint(), angleDelta,
+                      Qt::NoButton, modifier, Qt::NoScrollPhase, false, source);
     for (int expected : expectedValues) {
         qApp->sendEvent(&spinBox, &event);
         QCOMPARE(spinBox.value(), expected);
diff --git a/tests/auto/widgets/widgets/qsplitter/tst_qsplitter.cpp b/tests/auto/widgets/widgets/qsplitter/tst_qsplitter.cpp
index 8b45ac20b7..cbeb77a25e 100644
--- a/tests/auto/widgets/widgets/qsplitter/tst_qsplitter.cpp
+++ b/tests/auto/widgets/widgets/qsplitter/tst_qsplitter.cpp
@@ -599,7 +599,7 @@ void tst_QSplitter::testShowHide()
     QWidget widget(&topLevel);
     widget.resize(400 + split->handleWidth(), 200);
     QVBoxLayout *lay=new QVBoxLayout(&widget);
-    lay->setMargin(0);
+    lay->setContentsMargins(0, 0, 0, 0);
     lay->setSpacing(0);
     split->addWidget(new QWidget);
     split->addWidget(new QWidget);
diff --git a/tests/auto/widgets/widgets/qtabwidget/tst_qtabwidget.cpp b/tests/auto/widgets/widgets/qtabwidget/tst_qtabwidget.cpp
index cbf5196bb9..feade7d443 100644
--- a/tests/auto/widgets/widgets/qtabwidget/tst_qtabwidget.cpp
+++ b/tests/auto/widgets/widgets/qtabwidget/tst_qtabwidget.cpp
@@ -620,7 +620,7 @@ void tst_QTabWidget::heightForWidth()
 
     QWidget *window = new QWidget;
     QVBoxLayout *lay = new QVBoxLayout(window);
-    lay->setMargin(0);
+    lay->setContentsMargins(0, 0, 0, 0);
     lay->setSpacing(0);
     QTabWidget *tabWid = new QTabWidget(window);
     QWidget *w = new QWidget;
@@ -637,7 +637,7 @@ void tst_QTabWidget::heightForWidth()
                                );
     label->setWordWrap(true);
     lay2->addWidget(label);
-    lay2->setMargin(0);
+    lay2->setContentsMargins(0, 0, 0, 0);
 
     lay->addWidget(tabWid);
     int h = window->heightForWidth(160);
diff --git a/tests/auto/widgets/widgets/qtextedit/tst_qtextedit.cpp b/tests/auto/widgets/widgets/qtextedit/tst_qtextedit.cpp
index 81682dc027..c2cf31bfa4 100644
--- a/tests/auto/widgets/widgets/qtextedit/tst_qtextedit.cpp
+++ b/tests/auto/widgets/widgets/qtextedit/tst_qtextedit.cpp
@@ -2669,12 +2669,14 @@ void tst_QTextEdit::wheelEvent()
     ed.setReadOnly(true);
 
     float defaultFontSize = ed.font().pointSizeF();
-    QWheelEvent wheelUp(QPointF(), QPointF(), QPoint(), QPoint(0, 120), 120, Qt::Vertical, Qt::NoButton, Qt::ControlModifier);
+    QWheelEvent wheelUp(QPointF(), QPointF(), QPoint(), QPoint(0, 120),
+                        Qt::NoButton, Qt::ControlModifier, Qt::NoScrollPhase, Qt::MouseEventNotSynthesized);
     ed.wheelEvent(&wheelUp);
 
     QCOMPARE(defaultFontSize + 1, ed.font().pointSizeF());
 
-    QWheelEvent wheelHalfDown(QPointF(), QPointF(), QPoint(), QPoint(0, -60), -60, Qt::Vertical, Qt::NoButton, Qt::ControlModifier);
+    QWheelEvent wheelHalfDown(QPointF(), QPointF(), QPoint(), QPoint(0, -60),
+                              Qt::NoButton, Qt::ControlModifier, Qt::NoScrollPhase, Qt::MouseEventNotSynthesized);
     ed.wheelEvent(&wheelHalfDown);
 
     QCOMPARE(defaultFontSize + 0.5, ed.font().pointSizeF());
diff --git a/tests/auto/widgets/widgets/qtoolbutton/BLACKLIST b/tests/auto/widgets/widgets/qtoolbutton/BLACKLIST
index df4fda196f..52ba36562f 100644
--- a/tests/auto/widgets/widgets/qtoolbutton/BLACKLIST
+++ b/tests/auto/widgets/widgets/qtoolbutton/BLACKLIST
@@ -1,2 +1,2 @@
 [task176137_autoRepeatOfAction]
-osx ci
+osx-10.13