12 files changed, 39 insertions, 9 deletions
diff --git a/tests/auto/corelib/animation/qparallelanimationgroup/BLACKLIST b/tests/auto/corelib/animation/qparallelanimationgroup/BLACKLIST
new file mode 100644
index 0000000000..fe1d5bd968
--- /dev/null
+++ b/tests/auto/corelib/animation/qparallelanimationgroup/BLACKLIST
@@ -0,0 +1,2 @@
+[deleteChildrenWithRunningGroup]
+osx-10.12
diff --git a/tests/auto/corelib/io/qfile/test/test.pro b/tests/auto/corelib/io/qfile/test/test.pro
index 7ad047e8a2..1472ddbb83 100644
--- a/tests/auto/corelib/io/qfile/test/test.pro
+++ b/tests/auto/corelib/io/qfile/test/test.pro
@@ -4,6 +4,12 @@ QT = core-private core testlib
 qtHaveModule(network): QT += network
 else: DEFINES += QT_NO_NETWORK
 
+contains(CONFIG, builtin_testdata) {
+    DEFINES += BUILTIN_TESTDATA
+}
+
+TESTDATA += ../BLACKLIST
+
 TARGET = ../tst_qfile
 SOURCES = ../tst_qfile.cpp
 INCLUDEPATH += ../../../../../shared/
diff --git a/tests/auto/corelib/io/qfile/tst_qfile.cpp b/tests/auto/corelib/io/qfile/tst_qfile.cpp
index f97501e8a6..17497e46b9 100644
--- a/tests/auto/corelib/io/qfile/tst_qfile.cpp
+++ b/tests/auto/corelib/io/qfile/tst_qfile.cpp
@@ -250,6 +250,9 @@ private slots:
     void reuseQFile();
 
 private:
+#ifdef BUILTIN_TESTDATA
+    QSharedPointer<QTemporaryDir> m_dataDir;
+#endif
     enum FileType {
         OpenQFile,
         OpenFd,
@@ -428,8 +431,15 @@ void tst_QFile::initTestCase()
     QVERIFY(!m_forRenamingFile.isEmpty());
     m_twoDotsFile = QFINDTESTDATA("two.dots.file");
     QVERIFY(!m_twoDotsFile.isEmpty());
+
+#ifndef BUILTIN_TESTDATA
     m_testFile = QFINDTESTDATA("testfile.txt");
     QVERIFY(!m_testFile.isEmpty());
+#else
+    m_dataDir = QEXTRACTTESTDATA("/");
+    QVERIFY2(!m_dataDir.isNull(), qPrintable("Could not extract test data"));
+    m_testFile = m_dataDir->path() + "/testfile.txt";
+#endif
     m_resourcesDir = QFINDTESTDATA("resources");
     QVERIFY(!m_resourcesDir.isEmpty());
     m_noEndOfLineFile = QFINDTESTDATA("noendofline.txt");
diff --git a/tests/auto/corelib/io/qtextstream/BLACKLIST b/tests/auto/corelib/io/qtextstream/BLACKLIST
index bc3f118b33..b54b53cd74 100644
--- a/tests/auto/corelib/io/qtextstream/BLACKLIST
+++ b/tests/auto/corelib/io/qtextstream/BLACKLIST
@@ -1,2 +1,3 @@
 [stillOpenWhenAtEnd]
 windows
+winrt
diff --git a/tests/auto/corelib/io/qtextstream/test/test.pro b/tests/auto/corelib/io/qtextstream/test/test.pro
index 50335524d3..3dcfa0b414 100644
--- a/tests/auto/corelib/io/qtextstream/test/test.pro
+++ b/tests/auto/corelib/io/qtextstream/test/test.pro
@@ -18,7 +18,8 @@ TESTDATA += \
     ../task113817.txt \
     ../qtextstream.qrc \
     ../tst_qtextstream.cpp \
-    ../resources
+    ../resources \
+    ../BLACKLIST
 
 builtin_testdata {
     DEFINES += BUILTIN_TESTDATA
diff --git a/tests/auto/corelib/io/qurl/tst_qurl.cpp b/tests/auto/corelib/io/qurl/tst_qurl.cpp
index 1cbb7ad19c..7eeaea564f 100644
--- a/tests/auto/corelib/io/qurl/tst_qurl.cpp
+++ b/tests/auto/corelib/io/qurl/tst_qurl.cpp
@@ -3061,11 +3061,7 @@ void tst_QUrl::fromUserInputWithCwd_data()
 
     // "."
     {
-        const QUrl url = QUrl::fromLocalFile(base
-#ifdef Q_OS_WINRT
-                                      + QLatin1Char('/')
-#endif
-                                      ); // fromUserInput cleans the path
+        const QUrl url = QUrl::fromLocalFile(base); // fromUserInput cleans the path
         QTest::newRow("dot-in-path") << "." << base << url << url;
         QTest::newRow("dot-in-dot") << "." << QStringLiteral(".") << url << url;
     }
diff --git a/tests/auto/corelib/kernel/qtimer/tst_qtimer.cpp b/tests/auto/corelib/kernel/qtimer/tst_qtimer.cpp
index 06e2b0ea8c..e17d8ee38b 100644
--- a/tests/auto/corelib/kernel/qtimer/tst_qtimer.cpp
+++ b/tests/auto/corelib/kernel/qtimer/tst_qtimer.cpp
@@ -37,6 +37,7 @@
 
 #include <qtimer.h>
 #include <qthread.h>
+#include <qoperatingsystemversion.h>
 
 #if defined Q_OS_UNIX
 #include <unistd.h>
@@ -498,6 +499,9 @@ void tst_QTimer::moveToThread()
 {
 #if defined(Q_OS_WIN32)
     QSKIP("Does not work reliably on Windows :(");
+#elif defined(Q_OS_MACOS)
+    if (QOperatingSystemVersion::current() >= QOperatingSystemVersion::MacOSSierra)
+        QSKIP("Does not work reliably on macOS 10.12 (QTBUG-59679)");
 #endif
     QTimer ti1;
     QTimer ti2;
diff --git a/tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp b/tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp
index 4fccd9f4fc..97fce88f19 100644
--- a/tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp
+++ b/tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp
@@ -77,7 +77,7 @@ public:
 
     enum MetaEnumTest_Enum0 { MetaEnumTest_Enum0_dummy = 2, MetaEnumTest_Enum0_value = 42, MetaEnsureSignedEnum0 = -1 };
     Q_ENUM(MetaEnumTest_Enum0)
-    enum MetaEnumTest_Enum1 { MetaEnumTest_Enum1_value = 42, MetaEnumTest_Enum1_bigValue = (Q_INT64_C(1) << 33) + 50 };
+    enum MetaEnumTest_Enum1 : qint64 { MetaEnumTest_Enum1_value = 42, MetaEnumTest_Enum1_bigValue = (Q_INT64_C(1) << 33) + 50 };
     Q_ENUM(MetaEnumTest_Enum1)
 
     enum MetaEnumTest_Enum3 ENUM_SIZE(qint64) { MetaEnumTest_Enum3_value = -47, MetaEnumTest_Enum3_bigValue = (Q_INT64_C(1) << 56) + 5, MetaEnumTest_Enum3_bigNegValue = -(Q_INT64_C(1) << 56) - 3 };
@@ -4631,7 +4631,7 @@ void tst_QVariant::pairElements()
 
 enum EnumTest_Enum0 { EnumTest_Enum0_value = 42, EnumTest_Enum0_negValue = -8 };
 Q_DECLARE_METATYPE(EnumTest_Enum0)
-enum EnumTest_Enum1 { EnumTest_Enum1_value = 42, EnumTest_Enum1_bigValue = (Q_INT64_C(1) << 33) + 50 };
+enum EnumTest_Enum1 : qint64 { EnumTest_Enum1_value = 42, EnumTest_Enum1_bigValue = (Q_INT64_C(1) << 33) + 50 };
 Q_DECLARE_METATYPE(EnumTest_Enum1)
 
 #if defined(Q_COMPILER_CLASS_ENUM)
diff --git a/tests/auto/corelib/thread/qthread/qthread.pro b/tests/auto/corelib/thread/qthread/qthread.pro
index 381f6c9e45..37552f1fca 100644
--- a/tests/auto/corelib/thread/qthread/qthread.pro
+++ b/tests/auto/corelib/thread/qthread/qthread.pro
@@ -4,3 +4,6 @@ QT = core testlib
 SOURCES = tst_qthread.cpp
 qtConfig(c++14):CONFIG += c++14
 qtConfig(c++1z):CONFIG += c++1z
+
+INCLUDEPATH += ../../../../shared/
+HEADERS += ../../../../shared/emulationdetector.h
diff --git a/tests/auto/corelib/thread/qthread/tst_qthread.cpp b/tests/auto/corelib/thread/qthread/tst_qthread.cpp
index b107cf4b60..27a617ec85 100644
--- a/tests/auto/corelib/thread/qthread/tst_qthread.cpp
+++ b/tests/auto/corelib/thread/qthread/tst_qthread.cpp
@@ -51,6 +51,8 @@
 #include <exception>
 #endif
 
+#include "emulationdetector.h"
+
 class tst_QThread : public QObject
 {
     Q_OBJECT
@@ -943,6 +945,9 @@ void tst_QThread::adoptMultipleThreadsOverlap()
 // Disconnects on WinCE
 void tst_QThread::stressTest()
 {
+    if (EmulationDetector::isRunningArmOnX86())
+        QSKIP("Qemu uses too much memory for each thread. Test would run out of memory.");
+
     QTime t;
     t.start();
     while (t.elapsed() < one_minute) {
diff --git a/tests/auto/corelib/tools/qbytearray/tst_qbytearray.cpp b/tests/auto/corelib/tools/qbytearray/tst_qbytearray.cpp
index 16a9c03351..93c10d78db 100644
--- a/tests/auto/corelib/tools/qbytearray/tst_qbytearray.cpp
+++ b/tests/auto/corelib/tools/qbytearray/tst_qbytearray.cpp
@@ -1372,7 +1372,7 @@ void tst_QByteArray::toULongLong()
     QCOMPARE(b, ok);
 }
 
-static bool checkSize(size_t value, uint min)
+static bool checkSize(size_t value, size_t min)
 {
     return value >= min && value <= INT_MAX;
 }
diff --git a/tests/auto/corelib/tools/qsharedpointer/externaltests.cpp b/tests/auto/corelib/tools/qsharedpointer/externaltests.cpp
index e8f56fc1d3..62dd33131b 100644
--- a/tests/auto/corelib/tools/qsharedpointer/externaltests.cpp
+++ b/tests/auto/corelib/tools/qsharedpointer/externaltests.cpp
@@ -593,6 +593,8 @@ namespace QTest {
         } else {
             ok = qmake.waitForFinished();
             exitCode = qmake.exitCode();
+            if (!ok)
+                qmake.terminate();
 
             std_out += qmake.readAllStandardOutput();
             std_err += qmake.readAllStandardError();