Skip to content

Commit 27506c2

Browse files
Ulf HermannQt Cherry-pick Bot
authored andcommitted
Fix documentation for QML_ATTACHED and QML_FOREIGN
They can in fact not be combined. Pick-to: 6.2 Change-Id: Ic01edf9328d7235511f305ed15114360b79d0a36 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> (cherry picked from commit 5a86636) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit 8bd24a7) (cherry picked from commit f48bc12)
1 parent b26b2be commit 27506c2

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

src/qml/doc/src/qmlfunctions.qdoc

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -455,7 +455,7 @@
455455
Declares that any \l QML_ELEMENT, \l QML_NAMED_ELEMENT(), \l QML_ANONYMOUS,
456456
\l QML_INTERFACE, \l QML_UNCREATABLE(), \l QML_SINGLETON,
457457
\l QML_ADDED_IN_MINOR_VERSION(), \l QML_REMOVED_IN_MINOR_VERSION(),
458-
\l QML_ATTACHED(), \l QML_EXTENDED(), or \l QML_EXTENDED_NAMESPACE() macros
458+
\l QML_EXTENDED(), or \l QML_EXTENDED_NAMESPACE() macros
459459
in the enclosing C++ type do not apply to the enclosing type but instead to
460460
\a FOREIGN_TYPE. The enclosing type still needs to be registered with the
461461
\l {The Meta-Object System}{meta object system} using a \l Q_GADGET or
@@ -469,6 +469,9 @@
469469
the element will be named like the struct it is contained in, not the foreign type.
470470
See the \l {Extension Objects} for an example.
471471

472+
\note QML_ATTACHED() can currently not be redirected like this. It has to be
473+
specificed in the same type that implements qmlAttachedProperties().
474+
472475
\include {qualified-class-name.qdocinc} {class name must be qualified}
473476

474477
\sa QML_ELEMENT, QML_NAMED_ELEMENT(), QML_FOREIGN_NAMESPACE()

0 commit comments

Comments
 (0)