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

Change-Id: I4ebc848bf78a74fb26a630d8a4839f104612ff74

3 files changed, 10 insertions, 6 deletions

diff --git a/tests/auto/font/tst_font.cpp b/tests/auto/font/tst_font.cpp
index cd41be91..b9371c12 100644
--- a/tests/auto/font/tst_font.cpp
+++ b/tests/auto/font/tst_font.cpp
@@ -133,6 +133,11 @@ void tst_font::font()
     QFETCH(QString, testFile);
     QFETCH(QFont, expectedFont);
 
+    if (QSysInfo::productType().compare(QLatin1String("osx"), Qt::CaseInsensitive) == 0
+            && qgetenv("QTEST_ENVIRONMENT").split(' ').contains("CI")) {
+        QSKIP("This test crashes on macOS: QTBUG-70063");
+    }
+
     QQmlEngine engine;
     QQmlComponent component(&engine);
     component.loadUrl(testFileUrl(testFile));
diff --git a/tests/auto/qquickapplicationwindow/tst_qquickapplicationwindow.cpp b/tests/auto/qquickapplicationwindow/tst_qquickapplicationwindow.cpp
index dec32e36..80124230 100644
--- a/tests/auto/qquickapplicationwindow/tst_qquickapplicationwindow.cpp
+++ b/tests/auto/qquickapplicationwindow/tst_qquickapplicationwindow.cpp
@@ -492,11 +492,6 @@ void tst_QQuickApplicationWindow::attachedProperties()
     QVERIFY(!childItem->property("attached_footer").value<QQuickItem *>());
     QVERIFY(!childItem->property("attached_overlay").value<QQuickItem *>());
     childWindow->close();
-
-    // ### A temporary workaround to unblock the CI until the crash caused
-    // by https://codereview.qt-project.org/#/c/108517/ has been fixed...
-    window->hide();
-    qApp->processEvents();
 }
 
 void tst_QQuickApplicationWindow::font()
diff --git a/tests/auto/shared/qtest_quickcontrols.h b/tests/auto/shared/qtest_quickcontrols.h
index 1c803ae2..4a06c021 100644
--- a/tests/auto/shared/qtest_quickcontrols.h
+++ b/tests/auto/shared/qtest_quickcontrols.h
@@ -55,11 +55,15 @@ static int runTests(QObject *testObject, int argc, char *argv[])
     int res = 0;
     QTest::qInit(testObject, argc, argv);
     const QByteArray testObjectName = QTestResult::currentTestObjectName();
+    // setCurrentTestObject() takes a C string, which means we must ensure
+    // that the string we pass in lives long enough (i.e until the next call
+    // to setCurrentTestObject()), so store the name outside of the loop.
+    QByteArray testName;
     const QStringList styles = testStyles();
     for (const QString &style : styles) {
         qmlClearTypeRegistrations();
         QQuickStyle::setStyle(style);
-        const QByteArray testName = testObjectName + "::" + style.toLocal8Bit();
+        testName = testObjectName + "::" + style.toLocal8Bit();
         QTestResult::setCurrentTestObject(testName);
         res += QTest::qRun();
     }