diff options
author | Fabian Kosmale <fabian.kosmale@qt.io> | 2020-08-17 10:59:47 +0200 |
---|---|---|
committer | Lars Knoll <lars.knoll@qt.io> | 2020-08-23 20:50:04 +0200 |
commit | 48b4c1f450109b148f03f62574d78b460859c4a1 (patch) | |
tree | bbd5f5f2e123444c28179e5886684535c8d09830 /src/qml/jsruntime/qv4qobjectwrapper.cpp | |
parent | f7100fbaaceb7c74b164a9130218a197454433cf (diff) |
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 <fawzi.mohamed@qt.io>
Diffstat (limited to 'src/qml/jsruntime/qv4qobjectwrapper.cpp')
-rw-r--r-- | src/qml/jsruntime/qv4qobjectwrapper.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/qml/jsruntime/qv4qobjectwrapper.cpp b/src/qml/jsruntime/qv4qobjectwrapper.cpp index d37f80ab0a..edd323286a 100644 --- a/src/qml/jsruntime/qv4qobjectwrapper.cpp +++ b/src/qml/jsruntime/qv4qobjectwrapper.cpp @@ -200,7 +200,7 @@ static QV4::ReturnedValue loadProperty(QV4::ExecutionEngine *v4, QObject *object "'%s::%s'", p.typeName(), object->metaObject()->className(), p.name()); return QV4::Encode::undefined(); } else { - QVariant v(property.propType(), (void *)nullptr); + QVariant v(QMetaType(property.propType()), (void *)nullptr); property.readProperty(object, v.data()); return scope.engine->fromVariant(v); } @@ -956,7 +956,7 @@ struct QObjectSlotDispatcher : public QtPrivate::QSlotObjectBase if (type == qMetaTypeId<QVariant>()) { jsCallData->args[ii] = v4->fromVariant(*((QVariant *)metaArgs[ii + 1])); } else { - jsCallData->args[ii] = v4->fromVariant(QVariant(type, metaArgs[ii + 1])); + jsCallData->args[ii] = v4->fromVariant(QVariant(QMetaType(type), metaArgs[ii + 1])); } } @@ -1775,7 +1775,7 @@ void CallArgument::initAsType(int callType) jsonValuePtr = new (&allocData) QJsonValue(); } else { type = -1; - qvariantPtr = new (&allocData) QVariant(callType, (void *)nullptr); + qvariantPtr = new (&allocData) QVariant(QMetaType(callType), (void *)nullptr); } } @@ -1916,7 +1916,7 @@ bool CallArgument::fromValue(int callType, QV4::ExecutionEngine *engine, const Q & (QMetaType::PointerToQObject | QMetaType::PointerToGadget)) { // You can assign null or undefined to any pointer. The result is a nullptr. if (value.isNull() || value.isUndefined()) { - qvariantPtr = new (&allocData) QVariant(callType, nullptr); + qvariantPtr = new (&allocData) QVariant(QMetaType(callType), nullptr); type = callType; } else { queryEngine = true; @@ -1943,15 +1943,15 @@ bool CallArgument::fromValue(int callType, QV4::ExecutionEngine *engine, const Q QObject *obj = ep->toQObject(v); if (obj != nullptr && !QQmlMetaObject::canConvert(obj, mo)) { - *qvariantPtr = QVariant(callType, nullptr); + *qvariantPtr = QVariant(QMetaType(callType), nullptr); return false; } - *qvariantPtr = QVariant(callType, &obj); + *qvariantPtr = QVariant(QMetaType(callType), &obj); return true; } - *qvariantPtr = QVariant(callType, (void *)nullptr); + *qvariantPtr = QVariant(QMetaType(callType), (void *)nullptr); return false; } } |