diff options
author | Ulf Hermann <ulf.hermann@qt.io> | 2022-10-05 17:01:21 +0200 |
---|---|---|
committer | Ulf Hermann <ulf.hermann@qt.io> | 2022-10-07 15:17:02 +0200 |
commit | 81faddec9c6607834da4fdb931f81f29e1f7ac69 (patch) | |
tree | b71d0df5f0febaf5b24bab4baa9d718e64436112 /src/qml/qml/qqmlvaluetypewrapper.cpp | |
parent | 8d9fd352f8b7fb80e75372d6ad337264887a3b14 (diff) |
V4: Drop extra QVariant parameter from fromData()
The data needs to be copied anyway if we are going to store it in
ScarceResourceObject. We can just as well copy it from the void pointer.
Change-Id: Ic106221138b1236a6ddea20cfdb468c6fbe3e1c3
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Diffstat (limited to 'src/qml/qml/qqmlvaluetypewrapper.cpp')
-rw-r--r-- | src/qml/qml/qqmlvaluetypewrapper.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/qml/qml/qqmlvaluetypewrapper.cpp b/src/qml/qml/qqmlvaluetypewrapper.cpp index 067ea8ad86..b30c3f426b 100644 --- a/src/qml/qml/qqmlvaluetypewrapper.cpp +++ b/src/qml/qml/qqmlvaluetypewrapper.cpp @@ -72,7 +72,6 @@ QVariant Heap::QQmlValueTypeWrapper::toVariant() const return QVariant(valueType()->metaType, gadgetPtr()); } - ReturnedValue QQmlValueTypeReference::create( ExecutionEngine *engine, Heap::QQmlValueTypeReference *cloneFrom, QObject *object) { @@ -343,7 +342,7 @@ static ReturnedValue getGadgetProperty(ExecutionEngine *engine, void *args[] = { v.data(), nullptr }; metaObject->d.static_metacall(reinterpret_cast<QObject*>(valueTypeWrapper->gadgetPtr()), QMetaObject::ReadProperty, index, args); - return Encode(engine->newVariantObject(v)); + return Encode(engine->newVariantObject(metaType, v.constData())); } default: break; |