aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorUlf Hermann <ulf.hermann@qt.io>2020-09-14 15:24:13 +0200
committerUlf Hermann <ulf.hermann@qt.io>2020-09-15 13:32:47 +0200
commit0fd8906e743d8c58b5ca7e67be95c5b12ed1f312 (patch)
tree1cde06ac5682100d14c1a5ef871de9f5c8b17242
parent012a4528a515af8d7ec7dbc05a38d8fd0d6d4d1b (diff)
Quick: Manually register metatype for QVector<QVector<QPointF>>
For some reason this doesn't happen automatically anymore, and therefore the qquickshape test failed. Change-Id: Idc1281375123458923fdbc3ce2041d9e4fcfaf5f Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
-rw-r--r--src/quick/util/qquickglobal.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/quick/util/qquickglobal.cpp b/src/quick/util/qquickglobal.cpp
index fb1645803f..4d5b8e4a1c 100644
--- a/src/quick/util/qquickglobal.cpp
+++ b/src/quick/util/qquickglobal.cpp
@@ -57,6 +57,8 @@
#include <QtQml/private/qv4engine_p.h>
#include <QtQml/private/qv4object_p.h>
+#include <QtCore/qiterable.h>
+
#ifdef Q_CC_MSVC
// MSVC2010 warns about 'unused variable t', even if it's used in t->~T()
# pragma warning( disable : 4189 )
@@ -1050,6 +1052,9 @@ static QQuickGuiProvider *getGuiProvider()
void QQuick_initializeModule()
{
+ // This is used by QQuickPath, and on macOS it fails to automatically register.
+ qRegisterMetaType<QVector<QVector<QPointF>>>();
+
QQml_addValueTypeProvider(getValueTypeProvider());
QQml_setColorProvider(getColorProvider());
QQml_setGuiProvider(getGuiProvider());