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

 Conflicts:
	examples/widgets/graphicsview/boxes/scene.h
	src/corelib/Qt5CoreMacros.cmake
	src/corelib/Qt6CoreMacros.cmake
	src/network/ssl/qsslsocket.cpp
	src/network/ssl/qsslsocket.h
	src/platformsupport/fontdatabases/windows/qwindowsfontenginedirectwrite.cpp
	src/testlib/CMakeLists.txt
	src/testlib/.prev_CMakeLists.txt
	tests/auto/corelib/tools/qscopeguard/tst_qscopeguard.cpp

Disabled building manual tests with CMake for now, because qmake
doesn't do it, and it confuses people.

Done-With: Alexandru Croitor <alexandru.croitor@qt.io>
Done-With: Volker Hilsheimer <volker.hilsheimer@qt.io>
Change-Id: I865ae347bd01f4e59f16d007b66d175a52f1f152

9 files changed, 246 insertions, 41 deletions

diff --git a/tests/auto/widgets/dialogs/qfilesystemmodel/tst_qfilesystemmodel.cpp b/tests/auto/widgets/dialogs/qfilesystemmodel/tst_qfilesystemmodel.cpp
index 4e31c3e57c..63bf103725 100644
--- a/tests/auto/widgets/dialogs/qfilesystemmodel/tst_qfilesystemmodel.cpp
+++ b/tests/auto/widgets/dialogs/qfilesystemmodel/tst_qfilesystemmodel.cpp
@@ -1014,30 +1014,38 @@ void tst_QFileSystemModel::drives()
 
 void tst_QFileSystemModel::dirsBeforeFiles()
 {
-    QDir dir(flatDirTestPath);
+    auto diagnosticMsg = [](int row, const QFileInfo &left, const QFileInfo &right) -> QByteArray {
+        QString message;
+        QDebug(&message).noquote() << "Unexpected sort order at #" << row << ':' << left << right;
+        return message.toLocal8Bit();
+    };
+    QTemporaryDir testDir(flatDirTestPath);
+    QVERIFY2(testDir.isValid(), qPrintable(testDir.errorString()));
+    QDir dir(testDir.path());
 
     const int itemCount = 3;
     for (int i = 0; i < itemCount; ++i) {
         QLatin1Char c('a' + char(i));
         QVERIFY(dir.mkdir(c + QLatin1String("-dir")));
-        QFile file(flatDirTestPath + QLatin1Char('/') + c + QLatin1String("-file"));
+        QFile file(dir.filePath(c + QLatin1String("-file")));
         QVERIFY(file.open(QIODevice::ReadWrite));
         file.close();
     }
 
     QScopedPointer<QFileSystemModel> model(new QFileSystemModel);
-    QModelIndex root = model->setRootPath(flatDirTestPath);
+    QModelIndex root = model->setRootPath(dir.absolutePath());
     // Wait for model to be notified by the file system watcher
     QTRY_COMPARE(model->rowCount(root), 2 * itemCount);
-
-    // Ensure that no file occurs before any directory:
-    for (int i = 1; i < model->rowCount(root); ++i) {
+    // sort explicitly - dirs before files (except on macOS), and then by name
+    model->sort(0);
+    // Ensure that no file occurs before any directory (see QFileSystemModelSorter):
+    for (int i = 1, count = model->rowCount(root); i < count; ++i) {
+        const QFileInfo previous = model->fileInfo(model->index(i - 1, 0, root));
+        const QFileInfo current = model->fileInfo(model->index(i, 0, root));
 #ifndef Q_OS_MAC
-        QVERIFY(!(model->fileInfo(model->index(i - 1, 0, root)).isFile()
-                  && model->fileInfo(model->index(i, 0, root)).isDir()));
+        QVERIFY2(!(previous.isFile() && current.isDir()), diagnosticMsg(i, previous, current).constData());
 #else
-        QVERIFY(model->fileInfo(model->index(i - 1, 0, root)).fileName() <
-                model->fileInfo(model->index(i, 0, root)).fileName());
+        QVERIFY2(previous.fileName() < current.fileName(), diagnosticMsg(i, previous, current).constData());
 #endif
     }
 }
diff --git a/tests/auto/widgets/dialogs/qinputdialog/tst_qinputdialog.cpp b/tests/auto/widgets/dialogs/qinputdialog/tst_qinputdialog.cpp
index 259de49c67..877784041b 100644
--- a/tests/auto/widgets/dialogs/qinputdialog/tst_qinputdialog.cpp
+++ b/tests/auto/widgets/dialogs/qinputdialog/tst_qinputdialog.cpp
@@ -326,7 +326,7 @@ void tst_QInputDialog::getDouble()
     // rounded off to 10.03)
     const double value = static_cast<int>(min + (max - min) / 2);
     const double result =
-        QInputDialog::getDouble(parent, "", "", value, min, max, decimals, &ok);
+        QInputDialog::getDouble(parent, "", "", value, min, max, decimals, &ok, Qt::WindowFlags(), 1);
     QVERIFY(ok);
     QCOMPARE(result, value);
     delete parent;
@@ -395,7 +395,8 @@ void tst_QInputDialog::taskQTBUG_54693_crashWhenParentIsDeletedWhileDialogIsOpen
         const double initial = 7;
         QAutoPointer<SelfDestructParent> dialog(new SelfDestructParent);
         bool ok = true;
-        const double result = QInputDialog::getDouble(dialog.get(), "Title", "Label", initial, -10, +10, 2, &ok);
+        const double result = QInputDialog::getDouble(dialog.get(), "Title", "Label", initial, -10, +10, 2, &ok,
+                                                      Qt::WindowFlags(), 1);
         QVERIFY(!dialog);
         QVERIFY(!ok);
         QCOMPARE(result, initial);
@@ -411,7 +412,7 @@ void tst_QInputDialog::task255502getDouble()
     bool ok = false;
     const double value = 0.001;
     const double result =
-        QInputDialog::getDouble(parent, "", "", value, -1, 1, 4, &ok);
+        QInputDialog::getDouble(parent, "", "", value, -1, 1, 4, &ok, Qt::WindowFlags(), 1);
     QVERIFY(ok);
     QCOMPARE(result, value);
     delete parent;
diff --git a/tests/auto/widgets/graphicsview/qgraphicsitem/BLACKLIST b/tests/auto/widgets/graphicsview/qgraphicsitem/BLACKLIST
index e760042def..31dbb38a5d 100644
--- a/tests/auto/widgets/graphicsview/qgraphicsitem/BLACKLIST
+++ b/tests/auto/widgets/graphicsview/qgraphicsitem/BLACKLIST
@@ -1,3 +1,4 @@
 # QTBUG-74760
 [sorting]
 opensuse-42.3
+osx
diff --git a/tests/auto/widgets/graphicsview/qgraphicsproxywidget/tst_qgraphicsproxywidget.cpp b/tests/auto/widgets/graphicsview/qgraphicsproxywidget/tst_qgraphicsproxywidget.cpp
index a437b05479..8c2d89e34b 100644
--- a/tests/auto/widgets/graphicsview/qgraphicsproxywidget/tst_qgraphicsproxywidget.cpp
+++ b/tests/auto/widgets/graphicsview/qgraphicsproxywidget/tst_qgraphicsproxywidget.cpp
@@ -89,6 +89,7 @@ private slots:
     void focusNextPrevChild();
     void focusOutEvent_data();
     void focusOutEvent();
+    void focusProxy_QTBUG_51856();
     void hoverEnterLeaveEvent_data();
     void hoverEnterLeaveEvent();
     void hoverMoveEvent_data();
@@ -864,6 +865,75 @@ void tst_QGraphicsProxyWidget::focusOutEvent()
     }
 }
 
+void tst_QGraphicsProxyWidget::focusProxy_QTBUG_51856()
+{
+    // QSpinBox has an internal QLineEdit; this QLineEdit has the spinbox
+    // as its focus proxy.
+    struct FocusedSpinBox : QSpinBox
+    {
+        int focusCount = 0;
+
+        bool event(QEvent *event) override
+        {
+            switch (event->type()) {
+            case QEvent::FocusIn:
+                ++focusCount;
+                break;
+            case QEvent::FocusOut:
+                --focusCount;
+                break;
+            default:
+                break;
+            }
+            return QSpinBox::event(event);
+        }
+    };
+
+    QGraphicsScene scene;
+    QGraphicsView view(&scene);
+    SubQGraphicsProxyWidget *proxy = new SubQGraphicsProxyWidget;
+    scene.addItem(proxy);
+    view.show();
+    view.raise();
+    view.activateWindow();
+    QVERIFY(QTest::qWaitForWindowActive(&view));
+
+    FocusedSpinBox *spinBox = new FocusedSpinBox;
+
+    proxy->setWidget(spinBox);
+    proxy->show();
+    proxy->setFocus();
+    QVERIFY(proxy->hasFocus());
+    QEXPECT_FAIL("", "Widget should have focus but doesn't", Continue);
+    QVERIFY(spinBox->hasFocus());
+    QEXPECT_FAIL("", "Widget should have focus but doesn't", Continue);
+    QCOMPARE(spinBox->focusCount, 1);
+
+    enum { Count = 10 };
+
+    for (int i = 0; i < Count; ++i) {
+        for (int clickCount = 0; clickCount < Count; ++clickCount) {
+            auto proxyCenter = proxy->boundingRect().center();
+            auto proxyCenterInScene = proxy->mapToScene(proxyCenter);
+            auto proxyCenterInView = view.mapFromScene(proxyCenterInScene);
+
+            QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, proxyCenterInView);
+            QTRY_COMPARE(spinBox->focusCount, 1);
+        }
+
+        QLineEdit *edit = new QLineEdit(&view);
+        edit->show();
+        QTRY_VERIFY(edit->isVisible());
+        edit->setFocus();
+        QTRY_VERIFY(edit->hasFocus());
+        QTRY_VERIFY(!proxy->hasFocus());
+        QTRY_COMPARE(proxy->focusOut, i + 1);
+        QTRY_VERIFY(!spinBox->hasFocus());
+        QTRY_COMPARE(spinBox->focusCount, 0);
+        delete edit;
+    }
+}
+
 class EventLogger : public QWidget
 {
 public:
diff --git a/tests/auto/widgets/graphicsview/qgraphicsview/BLACKLIST b/tests/auto/widgets/graphicsview/qgraphicsview/BLACKLIST
index 9b76ea02ff..f59544f336 100644
--- a/tests/auto/widgets/graphicsview/qgraphicsview/BLACKLIST
+++ b/tests/auto/widgets/graphicsview/qgraphicsview/BLACKLIST
@@ -16,3 +16,5 @@ opensuse-42.3
 [itemsInRect_cosmeticAdjust]
 # QTBUG-66815
 ubuntu-16.04
+[fitInView]
+osx
diff --git a/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp b/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp
index c015bf85d0..9c16b1a00a 100644
--- a/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp
+++ b/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp
@@ -409,6 +409,8 @@ private slots:
     void closeEvent();
     void closeWithChildWindow();
 
+    void winIdAfterClose();
+
 private:
     bool ensureScreenSize(int width, int height);
 
@@ -11309,5 +11311,54 @@ void tst_QWidget::closeWithChildWindow()
     QVERIFY(!childWidget->isVisible());
 }
 
+class WinIdChangeSpy : public QObject
+{
+    Q_OBJECT
+public:
+    QWidget *widget = nullptr;
+    WId winId = 0;
+    explicit WinIdChangeSpy(QWidget *w, QObject *parent = nullptr)
+        : QObject(parent)
+        , widget(w)
+        , winId(widget->winId())
+    {
+    }
+
+public slots:
+    bool eventFilter(QObject *obj, QEvent *event) override
+    {
+        if (obj == widget) {
+            if (event->type() == QEvent::WinIdChange) {
+                winId = widget->winId();
+                return true;
+            }
+        }
+        return false;
+    }
+};
+
+void tst_QWidget::winIdAfterClose()
+{
+    auto widget = new QWidget;
+    auto notifier = new QObject(widget);
+    auto deleteWidget = new QWidget(new QWidget(widget));
+    auto spy = new WinIdChangeSpy(deleteWidget);
+    deleteWidget->installEventFilter(spy);
+    connect(notifier, &QObject::destroyed, [&] { delete deleteWidget; });
+
+    widget->setAttribute(Qt::WA_NativeWindow);
+    widget->windowHandle()->create();
+    widget->show();
+
+    QVERIFY(QTest::qWaitForWindowExposed(widget));
+    QVERIFY(spy->winId);
+
+    widget->windowHandle()->close();
+    delete widget;
+
+    QCOMPARE(spy->winId, WId(0));
+    delete spy;
+}
+
 QTEST_MAIN(tst_QWidget)
 #include "tst_qwidget.moc"
diff --git a/tests/auto/widgets/widgets/qbuttongroup/tst_qbuttongroup.cpp b/tests/auto/widgets/widgets/qbuttongroup/tst_qbuttongroup.cpp
index 5d52acd1a2..999cf4a941 100644
--- a/tests/auto/widgets/widgets/qbuttongroup/tst_qbuttongroup.cpp
+++ b/tests/auto/widgets/widgets/qbuttongroup/tst_qbuttongroup.cpp
@@ -58,6 +58,23 @@ protected:
     }
 };
 
+class TestPushButton : public QPushButton
+{
+public:
+    TestPushButton(QWidget *parent = nullptr)
+    : QPushButton(parent)
+    {}
+    TestPushButton(const QString &title, QWidget *parent = nullptr)
+    : QPushButton(title, parent)
+    {}
+
+protected:
+    bool hitButton(const QPoint &pos) const override
+    {
+        return rect().contains(pos);
+    }
+};
+
 #include <qbuttongroup.h>
 
 class tst_QButtonGroup : public QObject
@@ -97,7 +114,7 @@ void tst_QButtonGroup::arrowKeyNavigation()
     QGroupBox g1("1", &dlg);
     QHBoxLayout g1layout(&g1);
     QRadioButton bt1("Radio1", &g1);
-    QPushButton pb("PB", &g1);
+    TestPushButton pb("PB", &g1);
     QLineEdit le(&g1);
     QRadioButton bt2("Radio2", &g1);
     g1layout.addWidget(&bt1);
@@ -231,9 +248,9 @@ void tst_QButtonGroup::exclusive()
 {
     QDialog dlg(0);
     QHBoxLayout layout(&dlg);
-    QPushButton *pushButton1 = new QPushButton(&dlg);
-    QPushButton *pushButton2 = new QPushButton(&dlg);
-    QPushButton *pushButton3 = new QPushButton(&dlg);
+    TestPushButton *pushButton1 = new TestPushButton(&dlg);
+    TestPushButton *pushButton2 = new TestPushButton(&dlg);
+    TestPushButton *pushButton3 = new TestPushButton(&dlg);
     pushButton1->setCheckable(true);
     pushButton2->setCheckable(true);
     pushButton3->setCheckable(true);
@@ -271,9 +288,9 @@ void tst_QButtonGroup::exclusive()
 void tst_QButtonGroup::testSignals()
 {
     QButtonGroup buttons;
-    QPushButton pb1;
-    QPushButton pb2;
-    QPushButton pb3;
+    TestPushButton pb1;
+    TestPushButton pb2;
+    TestPushButton pb3;
     buttons.addButton(&pb1);
     buttons.addButton(&pb2, 23);
     buttons.addButton(&pb3);
@@ -363,9 +380,9 @@ void tst_QButtonGroup::checkedButton()
 {
     QButtonGroup buttons;
     buttons.setExclusive(false);
-    QPushButton pb1;
+    TestPushButton pb1;
     pb1.setCheckable(true);
-    QPushButton pb2;
+    TestPushButton pb2;
     pb2.setCheckable(true);
     buttons.addButton(&pb1);
     buttons.addButton(&pb2, 23);
@@ -430,7 +447,7 @@ void tst_QButtonGroup::task209485_removeFromGroupInEventHandler()
     QFETCH(int, signalCount);
     qRegisterMetaType<QAbstractButton *>("QAbstractButton *");
 
-    QPushButton *button = new QPushButton;
+    TestPushButton *button = new TestPushButton;
     QButtonGroup group;
     group.addButton(button);
 
diff --git a/tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp b/tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp
index 1f301fd60f..6aca84e3cd 100644
--- a/tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp
+++ b/tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp
@@ -47,6 +47,7 @@
 #include <qtablewidget.h>
 #include <qscrollbar.h>
 #include <qboxlayout.h>
+#include <qstackedwidget.h>
 
 #include <qstandarditemmodel.h>
 #include <qstringlistmodel.h>
@@ -164,6 +165,7 @@ private slots:
     void task_QTBUG_56693_itemFontFromModel();
     void inputMethodUpdate();
     void task_QTBUG_52027_mapCompleterIndex();
+    void checkMenuItemPosWhenStyleSheetIsSet();
 
 private:
     PlatformInputContext m_platformInputContext;
@@ -1206,8 +1208,7 @@ void tst_QComboBox::currentIndex()
         QVERIFY(testWidget->currentText().isEmpty());
 
         // spy on currentIndexChanged
-        QSignalSpy indexChangedInt(testWidget, SIGNAL(currentIndexChanged(int)));
-        QSignalSpy indexChangedString(testWidget, SIGNAL(currentIndexChanged(QString)));
+        QSignalSpy indexChangedSpy(testWidget, SIGNAL(currentIndexChanged(int, QString)));
 
         // stuff items into it
         foreach(QString text, initialItems) {
@@ -1231,16 +1232,12 @@ void tst_QComboBox::currentIndex()
         QCOMPARE(testWidget->currentText(), expectedCurrentText);
 
         // check that signal count is correct
-        QCOMPARE(indexChangedInt.count(), expectedSignalCount);
-        QCOMPARE(indexChangedString.count(), expectedSignalCount);
+        QCOMPARE(indexChangedSpy.count(), expectedSignalCount);
 
         // compare with last sent signal values
-        if (indexChangedInt.count())
-            QCOMPARE(indexChangedInt.at(indexChangedInt.count() - 1).at(0).toInt(),
-                    testWidget->currentIndex());
-        if (indexChangedString.count())
-            QCOMPARE(indexChangedString.at(indexChangedString.count() - 1).at(0).toString(),
-                     testWidget->currentText());
+        if (indexChangedSpy.count())
+            QCOMPARE(indexChangedSpy.at(indexChangedSpy.count() - 1).at(0).toInt(),
+                     testWidget->currentIndex());
 
         if (edit) {
             testWidget->setCurrentIndex(-1);
@@ -2339,7 +2336,8 @@ public:
     {
         QStringList list;
         list << "one" << "two";
-        connect(this, SIGNAL(currentIndexChanged(int)), this, SLOT(onCurrentIndexChanged(int)));
+        connect(this, SIGNAL(currentIndexChanged(int, QString)),
+                this, SLOT(onCurrentIndexChanged(int)));
         addItems(list);
     }
 public slots:
@@ -2765,7 +2763,7 @@ void tst_QComboBox::resetModel()
     };
     QComboBox cb;
     StringListModel model({"1", "2"});
-    QSignalSpy spy(&cb, QOverload<int>::of(&QComboBox::currentIndexChanged));
+    QSignalSpy spy(&cb, QOverload<int, const QString &>::of(&QComboBox::currentIndexChanged));
     QCOMPARE(spy.count(), 0);
     QCOMPARE(cb.currentIndex(), -1); //no selection
 
@@ -3515,5 +3513,46 @@ void tst_QComboBox::task_QTBUG_52027_mapCompleterIndex()
     QCOMPARE(arguments.at(0).toInt(), 1);
 }
 
+void tst_QComboBox::checkMenuItemPosWhenStyleSheetIsSet()
+{
+    QString newCss = "QComboBox {font-size: 18pt;}";
+    QString oldCss = qApp->styleSheet();
+    qApp->setStyleSheet(newCss);
+
+    QWidget topLevel;
+    QVBoxLayout *layout = new QVBoxLayout(&topLevel);
+    QStackedWidget *stack = new QStackedWidget(&topLevel);
+    layout->addWidget(stack);
+    QWidget *container = new QWidget(&topLevel);
+    QHBoxLayout *cLayout = new QHBoxLayout(container);
+    QComboBox *cBox = new QComboBox;
+
+    QStandardItemModel *model = new QStandardItemModel(cBox);
+    QStandardItem *item = new QStandardItem(QStringLiteral("Item1"));
+    model->appendRow(item);
+    item = new QStandardItem(QStringLiteral("Item2"));
+    model->appendRow(item);
+    item = new QStandardItem(QStringLiteral("Item3"));
+    model->appendRow(item);
+    item = new QStandardItem(QStringLiteral("Item4"));
+    model->appendRow(item);
+    cBox->setModel(model);
+
+    cLayout->addWidget(cBox);
+    stack->addWidget(container);
+    topLevel.show();
+    cBox->showPopup();
+
+    QTRY_VERIFY(cBox->view());
+    QTRY_VERIFY(cBox->view()->isVisible());
+
+    int menuHeight = cBox->view()->geometry().height();
+    QRect menuItemRect = cBox->view()->visualRect(model->indexFromItem(item));
+
+    QCOMPARE(menuHeight, menuItemRect.y() + menuItemRect.height());
+
+    qApp->setStyleSheet(oldCss);
+}
+
 QTEST_MAIN(tst_QComboBox)
 #include "tst_qcombobox.moc"
diff --git a/tests/auto/widgets/widgets/qmdisubwindow/tst_qmdisubwindow.cpp b/tests/auto/widgets/widgets/qmdisubwindow/tst_qmdisubwindow.cpp
index 2c5cb88ed6..1c19bf96d6 100644
--- a/tests/auto/widgets/widgets/qmdisubwindow/tst_qmdisubwindow.cpp
+++ b/tests/auto/widgets/widgets/qmdisubwindow/tst_qmdisubwindow.cpp
@@ -152,6 +152,22 @@ Q_DECLARE_METATYPE(Qt::WindowType);
 Q_DECLARE_METATYPE(Qt::WindowFlags);
 Q_DECLARE_METATYPE(QMdiSubWindow*);
 
+class TestPushButton : public QPushButton
+{
+public:
+    TestPushButton(const QString &title, QWidget *parent = nullptr)
+    : QPushButton(title, parent)
+    {
+    }
+
+protected:
+    // don't rely on style-specific button behavior in test
+    bool hitButton(const QPoint &point) const override
+    {
+        return rect().contains(point);
+    }
+};
+
 class tst_QMdiSubWindow : public QObject
 {
     Q_OBJECT
@@ -390,7 +406,7 @@ void tst_QMdiSubWindow::mainWindowSupport()
     // the maximized subwindow's title is imposed onto the main window's titlebar.
     if (!nativeMenuBar) {
         QCOMPARE(mainWindow.windowTitle(), QString());
-        QMdiSubWindow *window = workspace->addSubWindow(new QPushButton(QLatin1String("Test")));
+        QMdiSubWindow *window = workspace->addSubWindow(new TestPushButton(QLatin1String("Test")));
         QString expectedTitle = QLatin1String("MainWindow's title is empty");
         window->setWindowTitle(expectedTitle);
         QCOMPARE(window->windowTitle(), expectedTitle);
@@ -1298,7 +1314,7 @@ void tst_QMdiSubWindow::changeFocusWithTab()
     QTest::keyPress(widget, Qt::Key_Backtab);
     QCOMPARE(QApplication::focusWidget(), static_cast<QWidget *>(firstLineEdit));
 
-    QMdiSubWindow *window = mdiArea.addSubWindow(new QPushButton);
+    QMdiSubWindow *window = mdiArea.addSubWindow(new TestPushButton(QLatin1String("test")));
     window->show();
     QCOMPARE(mdiArea.activeSubWindow(), window);
 
@@ -1907,7 +1923,7 @@ void tst_QMdiSubWindow::setFont()
     QSKIP("This test function is unstable in CI, please see QTBUG-22544");
     QMdiArea mdiArea;
     mdiArea.setWindowTitle(QLatin1String(QTest::currentTestFunction()));
-    QMdiSubWindow *subWindow = mdiArea.addSubWindow(new QPushButton(QLatin1String("test")));
+    QMdiSubWindow *subWindow = mdiArea.addSubWindow(new TestPushButton(QLatin1String("test")));
     subWindow->resize(300, 100);
     subWindow->setWindowTitle(QLatin1String("Window title"));
     mdiArea.show();
@@ -2057,19 +2073,19 @@ void tst_QMdiSubWindow::task_233197()
     QMenuBar *menuBar = mainWindow->menuBar(); // force creation of a menubar
     Q_UNUSED(menuBar);
 
-    QPushButton *focus1 = new QPushButton(QLatin1String("Focus 1"), mainWindow);
+    QPushButton *focus1 = new TestPushButton(QLatin1String("Focus 1"), mainWindow);
     QObject::connect(focus1, &QAbstractButton::clicked, subWindow1,
                      QOverload<>::of(&QWidget::setFocus));
     focus1->move(5, 30);
     focus1->show();
 
-    QPushButton *focus2 = new QPushButton(QLatin1String("Focus 2"), mainWindow);
+    QPushButton *focus2 = new TestPushButton(QLatin1String("Focus 2"), mainWindow);
     QObject::connect(focus2, &QAbstractButton::clicked, subWindow2,
                      QOverload<>::of(&QWidget::setFocus));
     focus2->move(5, 60);
     focus2->show();
 
-    QPushButton *close = new QPushButton(QLatin1String("Close"), mainWindow);
+    QPushButton *close = new TestPushButton(QLatin1String("Close"), mainWindow);
     QObject::connect(close, &QAbstractButton::clicked, mainWindow, &QWidget::close);
     close->move(5, 90);
     close->show();