Q(Untyped)Bindable: add takeBinding method

We missed takeBinding as a supported operation on Q(Untyped)Bindable.
To avoid adding version checks to code dealing with QBindableInterface,
we simply synthesize takeBinding as a combination of binding to retrieve
the binding and setBinding with a default-constructed
QUntypedPropertyBinding.

Change-Id: I43803a0dfe210353d0235f0373d2257f75ffe534
Reviewed-by: Lars Knoll <lars.knoll@qt.io>

1 files changed, 18 insertions, 0 deletions

diff --git a/tests/auto/corelib/kernel/qproperty/tst_qproperty.cpp b/tests/auto/corelib/kernel/qproperty/tst_qproperty.cpp
index 3b656dae25..31ed610b09 100644
--- a/tests/auto/corelib/kernel/qproperty/tst_qproperty.cpp
+++ b/tests/auto/corelib/kernel/qproperty/tst_qproperty.cpp
@@ -78,6 +78,7 @@ private slots:
     void notifiedProperty();
     void typeNoOperatorEqual();
     void bindingValueReplacement();
+    void quntypedBindableApi();
 
     void testNewStuff();
     void qobjectObservers();
@@ -1008,6 +1009,23 @@ void tst_QProperty::bindingValueReplacement()
 //    QCOMPARE(test.iconText.value(), 42);
 }
 
+void tst_QProperty::quntypedBindableApi()
+{
+    QProperty<int> iprop;
+    QUntypedBindable bindable(&iprop);
+    QVERIFY(!bindable.hasBinding());
+    QVERIFY(bindable.binding().isNull());
+    bindable.setBinding(Qt::makePropertyBinding([]() -> int {return 42;}));
+    QVERIFY(bindable.hasBinding());
+    QVERIFY(!bindable.binding().isNull());
+    QUntypedPropertyBinding binding = bindable.takeBinding();
+    QVERIFY(!bindable.hasBinding());
+    bindable.setBinding(binding);
+    QCOMPARE(iprop.value(), 42);
+    QUntypedBindable propLess;
+    QVERIFY(propLess.takeBinding().isNull());
+}
+
 class MyQObject : public QObject
 {
     Q_OBJECT