From 6e5258b48b6ffabdec81ca809d80d02491e10220 Mon Sep 17 00:00:00 2001 From: Andreas Eliasson Date: Wed, 26 Apr 2023 08:11:39 +0200 Subject: Doc: Fix return value for Q_ARG and Q_RETURN_ARG The macros no longer return QGenericArgument and QGenericReturnArgument objects. As of 6.5, they return QMetaMethodArgument and QMetaMethodReturnArgument, respectively. Fixes: QTBUG-113147 Pick-to: 6.5 Change-Id: I06e0cf8255e6d4fee43048850f1717b1740d4846 Reviewed-by: Ulf Hermann Reviewed-by: Thiago Macieira --- src/corelib/kernel/qmetaobject.cpp | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'src/corelib/kernel/qmetaobject.cpp') diff --git a/src/corelib/kernel/qmetaobject.cpp b/src/corelib/kernel/qmetaobject.cpp index 63577aab2e..6a775d13ac 100644 --- a/src/corelib/kernel/qmetaobject.cpp +++ b/src/corelib/kernel/qmetaobject.cpp @@ -4107,23 +4107,24 @@ const char *QMetaClassInfo::value() const */ /*! - \macro QGenericArgument Q_ARG(Type, const Type &value) + \macro QMetaMethodArgument Q_ARG(Type, const Type &value) \relates QMetaObject This macro takes a \a Type and a \a value of that type and - returns a \l QGenericArgument object that can be passed to - QMetaObject::invokeMethod(). + returns a QMetaMethodArgument, which can be passed to the template + QMetaObject::invokeMethod() with the \c {Args &&...} arguments. \sa Q_RETURN_ARG() */ /*! - \macro QGenericReturnArgument Q_RETURN_ARG(Type, Type &value) + \macro QMetaMethodReturnArgument Q_RETURN_ARG(Type, Type &value) \relates QMetaObject This macro takes a \a Type and a non-const reference to a \a - value of that type and returns a QGenericReturnArgument object - that can be passed to QMetaObject::invokeMethod(). + value of that type and returns a QMetaMethodReturnArgument, which can be + passed to the template QMetaObject::invokeMethod() with the \c {Args &&...} + arguments. \sa Q_ARG() */ -- cgit v1.2.3