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

 Conflicts:
	src/corelib/kernel/qobject.cpp

Change-Id: I8ca1163a1fa8072dcd16ea4426c58219149599fd

2 files changed, 7 insertions, 2 deletions

diff --git a/tests/auto/corelib/io/qprocess/testProcessEOF/testProcessEOF.pro b/tests/auto/corelib/io/qprocess/testProcessEOF/testProcessEOF.pro
index ab1394a5c9..6a23e52d95 100644
--- a/tests/auto/corelib/io/qprocess/testProcessEOF/testProcessEOF.pro
+++ b/tests/auto/corelib/io/qprocess/testProcessEOF/testProcessEOF.pro
@@ -1,6 +1,4 @@
 SOURCES = main.cpp
 CONFIG -= qt
 CONFIG += cmdline
-
-win32:!mingw:!equals(TEMPLATE_PREFIX, "vc"):QMAKE_CXXFLAGS += /GS-
 DESTDIR = ./
diff --git a/tests/auto/corelib/io/qstorageinfo/tst_qstorageinfo.cpp b/tests/auto/corelib/io/qstorageinfo/tst_qstorageinfo.cpp
index 1317489e2f..fe63cecccd 100644
--- a/tests/auto/corelib/io/qstorageinfo/tst_qstorageinfo.cpp
+++ b/tests/auto/corelib/io/qstorageinfo/tst_qstorageinfo.cpp
@@ -195,6 +195,10 @@ void tst_QStorageInfo::tempFile()
     file.close();
 
     QStorageInfo storage2(file.fileName());
+    if (free == storage2.bytesFree() && storage2.fileSystemType() == "apfs") {
+        QEXPECT_FAIL("", "This test is likely to fail on APFS", Continue);
+    }
+
     QVERIFY(free != storage2.bytesFree());
 }
 
@@ -221,6 +225,9 @@ void tst_QStorageInfo::caching()
     QCOMPARE(free, storage2.bytesFree());
     storage2.refresh();
     QCOMPARE(storage1, storage2);
+    if (free == storage2.bytesFree() && storage2.fileSystemType() == "apfs") {
+        QEXPECT_FAIL("", "This test is likely to fail on APFS", Continue);
+    }
     QVERIFY(free != storage2.bytesFree());
 }
 #endif