From 48b4c1f450109b148f03f62574d78b460859c4a1 Mon Sep 17 00:00:00 2001 From: Fabian Kosmale Date: Mon, 17 Aug 2020 10:59:47 +0200 Subject: Adapt to qtbase changes The internal QVariant constructor taking a QMetaTypeId has been removed. Thus, construct QMetaTypes where necessary from the id, or avoid a QMetaType -> ID -> QMetaType roundtrip where we already have a metatype. Also fix a few missing includse that were previously transitively included. Change-Id: I56ce92281d616108a4ff80fe5052b919d1282357 Reviewed-by: Fawzi Mohamed --- src/qml/qml/qqmlvmemetaobject.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/qml/qml/qqmlvmemetaobject.cpp') diff --git a/src/qml/qml/qqmlvmemetaobject.cpp b/src/qml/qml/qqmlvmemetaobject.cpp index 9af7e539e3..fbfc387cc6 100644 --- a/src/qml/qml/qqmlvmemetaobject.cpp +++ b/src/qml/qml/qqmlvmemetaobject.cpp @@ -361,7 +361,7 @@ bool QQmlInterceptorMetaObject::intercept(QMetaObject::Call c, int id, void **a) // QMetaProperty valueProp = valueType->property(valueIndex); - QVariant newValue(type, a[0]); + QVariant newValue(QMetaType(type), a[0]); valueType->read(object, id); QVariant prevComponentValue = valueProp.read(valueType); @@ -382,7 +382,7 @@ bool QQmlInterceptorMetaObject::intercept(QMetaObject::Call c, int id, void **a) if (updated) return true; } else { - vi->write(QVariant(type, a[0])); + vi->write(QVariant(QMetaType(type), a[0])); return true; } } -- cgit v1.2.3