From f48bc1291f26bfedd5d43dd5cbc40e7ade066eb2 Mon Sep 17 00:00:00 2001 From: Ulf Hermann Date: Fri, 12 Jan 2024 16:34:37 +0100 Subject: [PATCH] Fix documentation for QML_ATTACHED and QML_FOREIGN They can in fact not be combined. Pick-to: 6.5 6.2 Change-Id: Ic01edf9328d7235511f305ed15114360b79d0a36 Reviewed-by: Fabian Kosmale (cherry picked from commit 5a8663664ea49722a6f561bd2fad8fb30b4e7860) Reviewed-by: Qt Cherry-pick Bot (cherry picked from commit 8bd24a76b6e685bc1b0be351686365e84b1747cb) --- src/qml/doc/src/qmlfunctions.qdoc | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/qml/doc/src/qmlfunctions.qdoc b/src/qml/doc/src/qmlfunctions.qdoc index 070e3403fd..9e5b197cb1 100644 --- a/src/qml/doc/src/qmlfunctions.qdoc +++ b/src/qml/doc/src/qmlfunctions.qdoc @@ -528,7 +528,7 @@ \l QML_INTERFACE, \l QML_UNCREATABLE(), \l QML_SINGLETON, \l QML_ADDED_IN_VERSION(), \l QML_REMOVED_IN_VERSION(), \l QML_ADDED_IN_MINOR_VERSION(), \l QML_REMOVED_IN_MINOR_VERSION(), - \l QML_ATTACHED(), \l QML_EXTENDED(), or \l QML_EXTENDED_NAMESPACE() macros + \l QML_EXTENDED(), or \l QML_EXTENDED_NAMESPACE() macros in the enclosing C++ type do not apply to the enclosing type but instead to \a FOREIGN_TYPE. The enclosing type still needs to be registered with the \l {The Meta-Object System}{meta object system} using a \l Q_GADGET or @@ -542,6 +542,9 @@ the element will be named like the struct it is contained in, not the foreign type. See the \l {Extension Objects} for an example. + \note QML_ATTACHED() can currently not be redirected like this. It has to be + specificed in the same type that implements qmlAttachedProperties(). + \include {qualified-class-name.qdocinc} {class name must be qualified} \sa QML_ELEMENT, QML_NAMED_ELEMENT(), QML_FOREIGN_NAMESPACE()