diff options
| author | Andreas Eliasson <andreas.eliasson@qt.io> | 2023-04-26 08:11:39 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2023-04-27 10:22:51 +0000 |
| commit | 8c85e3f516cf2748f1e492fdacb9278fed1693d6 (patch) | |
| tree | e0709de572224efdd65ea2f608946df791554128 /src | |
| parent | ecf18bf9820aa11565c65d87f70cec5676eb9a9a (diff) | |
| download | qtbase-8c85e3f516cf2748f1e492fdacb9278fed1693d6.tar.gz | |
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
Change-Id: I06e0cf8255e6d4fee43048850f1717b1740d4846
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
(cherry picked from commit 6e5258b48b6ffabdec81ca809d80d02491e10220)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'src')
| -rw-r--r-- | src/corelib/kernel/qmetaobject.cpp | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/corelib/kernel/qmetaobject.cpp b/src/corelib/kernel/qmetaobject.cpp index ef518e3f1c..2c4c7c00e9 100644 --- a/src/corelib/kernel/qmetaobject.cpp +++ b/src/corelib/kernel/qmetaobject.cpp @@ -4050,23 +4050,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() */ |