From b6d04c8a823ab8486d72ca6dd72ab3007a6627a7 Mon Sep 17 00:00:00 2001 From: Marc Mutz Date: Tue, 2 May 2023 09:26:59 +0200 Subject: [PATCH] QMetaProperty: add writeOnGadget() overload taking rvalue QVariant The writeOnGadget() function is implemented in terms of write() (UB, btw, due to the cast to QObject*), which was recently overloaded for rvalue QVariants. Add a corresponding writeOnGadget() overload, too. [ChangeLog][QtCore][QMetaProperty] Added writeOnGadget() overload taking an rvalue QVariant. Amends 968250ee1444d3eabf3d805053f46015bc7185c5. Task-number: QTBUG-112762 Change-Id: I7fc686fcab293159f5a0d76dd6c8e23d5779c96c Reviewed-by: Giuseppe D'Angelo Reviewed-by: Fabian Kosmale --- src/corelib/kernel/qmetaobject.cpp | 10 ++++++++++ src/corelib/kernel/qmetaobject.h | 1 + 2 files changed, 11 insertions(+) diff --git a/src/corelib/kernel/qmetaobject.cpp b/src/corelib/kernel/qmetaobject.cpp index 5a75993ca3..ec3e6a1916 100644 --- a/src/corelib/kernel/qmetaobject.cpp +++ b/src/corelib/kernel/qmetaobject.cpp @@ -3806,6 +3806,16 @@ bool QMetaProperty::writeOnGadget(void *gadget, const QVariant &value) const return write(reinterpret_cast(gadget), value); } +/*! + \overload + \since 6.6 +*/ +bool QMetaProperty::writeOnGadget(void *gadget, QVariant &&value) const +{ + Q_ASSERT(priv(mobj->d.data)->flags & PropertyAccessInStaticMetaCall && mobj->d.static_metacall); + return write(reinterpret_cast(gadget), std::move(value)); +} + /*! \since 5.5 diff --git a/src/corelib/kernel/qmetaobject.h b/src/corelib/kernel/qmetaobject.h index d9c0d78831..c51922e659 100644 --- a/src/corelib/kernel/qmetaobject.h +++ b/src/corelib/kernel/qmetaobject.h @@ -370,6 +370,7 @@ public: QVariant readOnGadget(const void *gadget) const; bool writeOnGadget(void *gadget, const QVariant &value) const; + bool writeOnGadget(void *gadget, QVariant &&value) const; bool resetOnGadget(void *gadget) const; bool hasStdCppSet() const;