11 files changed, 37 insertions, 17 deletions
diff --git a/src/imports/imports.pro b/src/imports/imports.pro
index 9973883024..e0f66838ec 100644
--- a/src/imports/imports.pro
+++ b/src/imports/imports.pro
@@ -20,8 +20,9 @@ qtHaveModule(quick) {
         labsanimation \
         layouts \
         qtquick2 \
-        window \
-        wavefrontmesh
+        window
+
+    qtConfig(quick-shadereffect): SUBDIRS += wavefrontmesh
 
     qtHaveModule(testlib): SUBDIRS += testlib
     qtConfig(systemsemaphore): SUBDIRS += sharedimage
diff --git a/src/imports/layouts/qquicklayout_p.h b/src/imports/layouts/qquicklayout_p.h
index c022a2fd47..cb46c41e6c 100644
--- a/src/imports/layouts/qquicklayout_p.h
+++ b/src/imports/layouts/qquicklayout_p.h
@@ -135,7 +135,7 @@ class QQuickLayoutPrivate : public QQuickItemPrivate
 {
     Q_DECLARE_PUBLIC(QQuickLayout)
 public:
-    QQuickLayoutPrivate() : m_isReady(false), m_disableRearrange(true) {}
+    QQuickLayoutPrivate() : m_isReady(false), m_disableRearrange(true), m_hasItemChangeListeners(false) {}
 
 protected:
     unsigned m_isReady : 1;
diff --git a/src/qmltest/quicktestresult.cpp b/src/qmltest/quicktestresult.cpp
index d5ab267cec..f3a6fea193 100644
--- a/src/qmltest/quicktestresult.cpp
+++ b/src/qmltest/quicktestresult.cpp
@@ -480,7 +480,7 @@ static QString qtestFixUrl(const QUrl &location)
 void QuickTestResult::fail
     (const QString &message, const QUrl &location, int line)
 {
-    QTestResult::addFailure(message.toLatin1().constData(),
+    QTestResult::addFailure(message.toUtf8().constData(),
                             qtestFixUrl(location).toLatin1().constData(), line);
 }
 
@@ -493,7 +493,7 @@ bool QuickTestResult::verify
              qtestFixUrl(location).toLatin1().constData(), line);
     } else {
         return QTestResult::verify
-            (success, message.toLatin1().constData(), "",
+            (success, message.toUtf8().constData(), "",
              qtestFixUrl(location).toLatin1().constData(), line);
     }
 }
@@ -601,7 +601,7 @@ bool QuickTestResult::compare
      const QUrl &location, int line)
 {
     return QTestResult::compare
-        (success, message.toLocal8Bit().constData(),
+        (success, message.toUtf8().constData(),
          QTest::toString(val1.toString().toLatin1().constData()),
          QTest::toString(val2.toString().toLatin1().constData()),
          "", "",
@@ -611,7 +611,7 @@ bool QuickTestResult::compare
 void QuickTestResult::skip
     (const QString &message, const QUrl &location, int line)
 {
-    QTestResult::addSkip(message.toLatin1().constData(),
+    QTestResult::addSkip(message.toUtf8().constData(),
                          qtestFixUrl(location).toLatin1().constData(), line);
     QTestResult::setSkipCurrentTest(true);
 }
@@ -630,13 +630,13 @@ bool QuickTestResult::expectFailContinue
 {
     return QTestResult::expectFail
         (tag.toLatin1().constData(),
-         QTest::toString(comment.toLatin1().constData()),
+         QTest::toString(comment.toUtf8().constData()),
          QTest::Continue, qtestFixUrl(location).toLatin1().constData(), line);
 }
 
 void QuickTestResult::warn(const QString &message, const QUrl &location, int line)
 {
-    QTestLog::warn(message.toLatin1().constData(), qtestFixUrl(location).toLatin1().constData(), line);
+    QTestLog::warn(message.toUtf8().constData(), qtestFixUrl(location).toLatin1().constData(), line);
 }
 
 void QuickTestResult::ignoreWarning(const QJSValue &message)
@@ -646,7 +646,7 @@ void QuickTestResult::ignoreWarning(const QJSValue &message)
         QTestLog::ignoreMessage(QtWarningMsg, message.toVariant().toRegularExpression());
 #endif
     } else {
-        QTestLog::ignoreMessage(QtWarningMsg, message.toString().toLatin1());
+        QTestLog::ignoreMessage(QtWarningMsg, message.toString().toUtf8());
     }
 }
 
diff --git a/src/quick/configure.json b/src/quick/configure.json
index f8277332dc..8d1ddaea7c 100644
--- a/src/quick/configure.json
+++ b/src/quick/configure.json
@@ -134,7 +134,7 @@
             "label": "Path support",
             "purpose": "Provides Path elements.",
             "section": "Qt Quick",
-            "condition": "features.quick-shadereffect",
+            "condition": "module.gui",
             "output": [
                 "privateFeature"
             ]
diff --git a/src/quickshapes/qquickshapegenericrenderer_p.h b/src/quickshapes/qquickshapegenericrenderer_p.h
index 4590c662c1..75c4277383 100644
--- a/src/quickshapes/qquickshapegenericrenderer_p.h
+++ b/src/quickshapes/qquickshapegenericrenderer_p.h
@@ -57,6 +57,7 @@
 #include <qsggeometry.h>
 #include <qsgmaterial.h>
 #include <qsgrendererinterface.h>
+#include <qsgtexture.h>
 #include <QtCore/qrunnable.h>
 
 QT_BEGIN_NAMESPACE
diff --git a/tests/auto/qml/ecmascripttests/BLACKLIST b/tests/auto/qml/ecmascripttests/BLACKLIST
new file mode 100644
index 0000000000..1ed255e9e2
--- /dev/null
+++ b/tests/auto/qml/ecmascripttests/BLACKLIST
@@ -0,0 +1,4 @@
+[runInterpreted]
+macos ci
+[runJitted]
+macos
diff --git a/tests/auto/qmltest/animatedimage/BLACKLIST b/tests/auto/qmltest/animatedimage/BLACKLIST
index 3a5ed393ea..25eb7a7cff 100644
--- a/tests/auto/qmltest/animatedimage/BLACKLIST
+++ b/tests/auto/qmltest/animatedimage/BLACKLIST
@@ -1,2 +1,2 @@
 [AnimatedImage::test_crashRaceCondition_replyFinished]
-osx-10.13
+macos
diff --git a/tests/auto/qmltest/textedit/BLACKLIST b/tests/auto/qmltest/textedit/BLACKLIST
index e06cba3e8f..ac1ca6d8cf 100644
--- a/tests/auto/qmltest/textedit/BLACKLIST
+++ b/tests/auto/qmltest/textedit/BLACKLIST
@@ -1,6 +1,6 @@
 # Blacklist for testing
 [TextEdit::test_textentry]
-osx-10.12
+macos
 [TextEdit::test_textentry_char]
-osx-10.12
+macos
 
diff --git a/tests/auto/quick/qquickcanvasitem/BLACKLIST b/tests/auto/quick/qquickcanvasitem/BLACKLIST
new file mode 100644
index 0000000000..21580b6730
--- /dev/null
+++ b/tests/auto/quick/qquickcanvasitem/BLACKLIST
@@ -0,0 +1,14 @@
+[arcTo::test_transform]
+macos
+[canvas::test_paint]
+macos
+[canvas::test_save]
+macos
+[canvas::test_implicitlySizedParent]
+macos ci
+[canvas::test_toDataURL]
+macos
+[fillRect::test_fillRect]
+macos
+[imagedata::test_rounding]
+macos ci
diff --git a/tests/auto/quick/qquicklistview/BLACKLIST b/tests/auto/quick/qquicklistview/BLACKLIST
index 1f3736328a..6ef69550a4 100644
--- a/tests/auto/quick/qquicklistview/BLACKLIST
+++ b/tests/auto/quick/qquicklistview/BLACKLIST
@@ -5,10 +5,10 @@ opensuse-leap
 [populateTransitions]
 opensuse-42.1
 [contentHeightWithDelayRemove]
-osx-10.12
+macos
 #QTBUG-75960
 #QTBUG-76652
 [currentIndex]
-osx-10.12
+macos
 opensuse-leap
 ubuntu-18.04
diff --git a/tests/auto/quick/qquicktext/BLACKLIST b/tests/auto/quick/qquicktext/BLACKLIST
index 6c3c3af154..08a5249e2e 100644
--- a/tests/auto/quick/qquicktext/BLACKLIST
+++ b/tests/auto/quick/qquicktext/BLACKLIST
@@ -1,6 +1,6 @@
 [dependentImplicitSizes]
 b2qt
 qemu
-osx-10.12
+macos
 [fontSizeMode]
 opensuse-42.1