From 8806b91afe96b449c7a6e7fb2a08aafcf832bfd4 Mon Sep 17 00:00:00 2001 From: Andreas Eliasson Date: Fri, 10 Nov 2023 13:38:15 +0100 Subject: Doc: Merge dangling text with \note paragraph It's not possible to have empty lines inside a \note as this will cause the text after the empty line to appear outside the note box. So, remove the empty lines to make the note paragraph complete. Also, revise the text. Fixes: QTBUG-117111 Pick-to: 6.5 Change-Id: I50ad0cd559f684c5264898ef8bbac16910f96dea Reviewed-by: Fabian Kosmale Reviewed-by: Paul Wicking (cherry picked from commit e4bde15e149cf449911c9b871acfe8fafd4ac712) Reviewed-by: Qt Cherry-pick Bot --- src/corelib/kernel/qproperty.cpp | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/src/corelib/kernel/qproperty.cpp b/src/corelib/kernel/qproperty.cpp index b6e4caa709..c2ade0599b 100644 --- a/src/corelib/kernel/qproperty.cpp +++ b/src/corelib/kernel/qproperty.cpp @@ -1287,15 +1287,13 @@ QString QPropertyBindingError::description() const can be used to express relationships between different properties in your application. - \note In the case of QML it is important that \l QProperty needs to be exposed - in \l Q_PROPERTY with the BINDABLE keyword. As a result the QML engine, uses it - as the bindable interface to set up the property binding. In turn, the binding - can be then interacted with C++ via the normal API like: - + \note For QML, it's important to expose the \l QProperty in \l Q_PROPERTY + with the BINDABLE keyword. As a result, the QML engine uses + it as the bindable interface to set up the property binding. In turn, the + binding can then be interacted with C++ via the normal API: QProperty::onValueChanged, QProperty::takeBinding and QBindable::hasBinding - - If the property is BINDABLE, then the engine will use the change-tracking - inherent to the C++ property system for getting notified about changes; and + If the property is BINDABLE, the engine will use the change-tracking + inherent to the C++ property system for getting notified about changes, and it won't rely on signals being emitted. */ -- cgit v1.2.3