diff --git a/src/corelib/kernel/qproperty.h b/src/corelib/kernel/qproperty.h index 24aa1804f28..22313bc92e0 100644 --- a/src/corelib/kernel/qproperty.h +++ b/src/corelib/kernel/qproperty.h @@ -316,10 +316,11 @@ public: #ifndef Q_CLANG_QDOC template - QPropertyBinding setBinding(Functor f, - const QPropertyBindingSourceLocation &location = QT_PROPERTY_DEFAULT_BINDING_LOCATION) + QPropertyBinding setBinding(Functor &&f, + const QPropertyBindingSourceLocation &location = QT_PROPERTY_DEFAULT_BINDING_LOCATION, + std::enable_if_t> * = nullptr) { - return setBinding(Qt::makePropertyBinding(f, location)); + return setBinding(Qt::makePropertyBinding(std::forward(f), location)); } #else template diff --git a/tests/auto/corelib/kernel/qproperty/tst_qproperty.cpp b/tests/auto/corelib/kernel/qproperty/tst_qproperty.cpp index 488ecacb8d5..88942609884 100644 --- a/tests/auto/corelib/kernel/qproperty/tst_qproperty.cpp +++ b/tests/auto/corelib/kernel/qproperty/tst_qproperty.cpp @@ -68,6 +68,7 @@ private slots: void genericPropertyBinding(); void genericPropertyBindingBool(); void staticChangeHandler(); + void setBindingFunctor(); }; void tst_QProperty::functorBinding() @@ -674,6 +675,17 @@ void tst_QProperty::staticChangeHandler() QCOMPARE(t.observedValues, values); } +void tst_QProperty::setBindingFunctor() +{ + QProperty property; + QProperty injectedValue(100); + // Make sure that this picks the setBinding overload that takes a functor and + // moves it correctly. + property.setBinding([&injectedValue]() { return injectedValue.value(); }); + injectedValue = 200; + QCOMPARE(property.value(), 200); +} + QTEST_MAIN(tst_QProperty); #include "tst_qproperty.moc"