From f07c6f52ac4e336bd49c5d3cdaf89803460ba3bf Mon Sep 17 00:00:00 2001
From: Fabian Kosmale <fabian.kosmale@qt.io>
Date: Fri, 18 Dec 2020 15:51:38 +0100
Subject: QBindable: add initial documentation

Change-Id: I43681093c8819289037c76bd9c05b88a6da8311b
Reviewed-by: Andrei Golubev <andrei.golubev@qt.io>
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
---
 .../snippets/code/src_corelib_kernel_qproperty.cpp | 12 ++++
 src/corelib/kernel/qproperty.cpp                   | 72 ++++++++++++++++++++++
 2 files changed, 84 insertions(+)

(limited to 'src/corelib')

diff --git a/src/corelib/doc/snippets/code/src_corelib_kernel_qproperty.cpp b/src/corelib/doc/snippets/code/src_corelib_kernel_qproperty.cpp
index 4cb7c1c0ce..a402a70599 100644
--- a/src/corelib/doc/snippets/code/src_corelib_kernel_qproperty.cpp
+++ b/src/corelib/doc/snippets/code/src_corelib_kernel_qproperty.cpp
@@ -49,6 +49,7 @@
 ****************************************************************************/
 
 #include <QObject>
+#include <QDebug>
 
 //! [0]
 class MyClass : public QObject
@@ -107,3 +108,14 @@ private:
 Q_OBJECT_BINDABLE_PROPERTY_WITH_ARGS(MyClass, CustomType xProp, CustomType(5, 10),
                                      &MyClass::xChanged)
 //! [2]
+
+void usage_QBindable() {
+    //! [3]
+    MyClass *myObject;
+    QBindable<int> bindableX = myObject->bindableX();
+    qDebug() << bindableX.hasBinding(); // prints false
+    QProperty<int> y {42};
+    bindableX.setBinding([&](){ return 2*y.value(); });
+    qDebug() << bindableX.hasBinding() << myObject->x(); // prints true 84
+    //! [3]
+}
diff --git a/src/corelib/kernel/qproperty.cpp b/src/corelib/kernel/qproperty.cpp
index 686ec484ca..342a3d34eb 100644
--- a/src/corelib/kernel/qproperty.cpp
+++ b/src/corelib/kernel/qproperty.cpp
@@ -803,6 +803,78 @@ QString QPropertyBindingError::description() const
   Returns true if the underlying property has a binding.
 */
 
+/*!
+  \class QBindable
+  \inmodule QtCore
+  \brief QBindable is a wrapper class around binding-enabled properties. It allows type-safe
+         operations while abstracting the differences between the various property classes away.
+  \inherits QUntypedBindable
+
+   \ingroup tools
+
+   QBindable\<T\> helps to integrate Qt's traditional Q_PROPERTY with binding-enabled properties.
+   If a property is backed by a QProperty, QObjectBindableProperty or QObjectComputedProperty,
+   you can add \c BINDABLE bindablePropertyName to the Q_PROPERTY
+   declaration, where bindablePropertyName is a function returning an instance of QBindable
+   constructed from the QProperty. The returned QBindable allows users of the property to set
+   and query bindings of the property, without having to know the exact kind of binding-enabled
+   property used.
+
+   \snippet code/src_corelib_kernel_qproperty.cpp 0
+   \snippet code/src_corelib_kernel_qproperty.cpp 3
+
+   \sa QMetaProperty::isBindable, template <typename T> QProperty<T>, QObjectBindableProperty
+*/
+
+/*!
+  \fn template<typename T> QPropertyBinding<T> QBindable<T>::makeBinding(const QPropertyBindingSourceLocation &location)
+
+  Constructs a binding evaluating to the underlying property's value.
+*/
+
+/*!
+  \fn template <typename T> QPropertyBinding<T> QBindable<T>::binding()
+
+   Returns  the currently set binding of the underlying property. If the property does not
+   have a binding, the returned \c QPropertyBinding<T> will be invalid.
+
+   \sa setBinding, QPropertyBinding<T>::isValid(), hasBinding
+*/
+
+/*!
+  \fn template <typename T> void QBindable<T>::setBinding(const QPropertyBinding<T> &binding)
+
+   Sets the underlying property's binding to \a binding. Does nothing if the QBindable is
+   read-only or invalid.
+
+   \sa binding, QPropertyBinding<T>::isValid(), isReadOnly(), isValid()
+*/
+
+/*!
+  \fn  template <typename T> template <typename Functor> QPropertyBinding<T> QBindable<T>::setBinding(Functor f);
+  \overload
+
+  Creates a \c QPropertyBinding<T> from \a f, and sets it as the underlying property's binding.
+*/
+
+/*!
+  \fn template <typename T> T QBindable<T>::value() const
+
+  Returns the underlying property's current value. If the QBindable is invalid,
+  a default constructed \T is returned.
+
+  \sa isValid()
+*/
+
+/*!
+  \fn template <typename T> void QBindable<T>::setValue(const T & value) const
+
+  Sets the underlying property's value to \a value. This removes any currenltly set
+  binding from it. This function has no effect if the QBindable is read-only or invalid.
+
+  \sa isValid(), isReadOnly(), setBinding()
+*/
+
 /*!
   \class QProperty
   \inmodule QtCore
-- 
cgit v1.2.3