diff --git a/src/corelib/kernel/qproperty.h b/src/corelib/kernel/qproperty.h index 5ba4d2eda7c..de08a71349e 100644 --- a/src/corelib/kernel/qproperty.h +++ b/src/corelib/kernel/qproperty.h @@ -731,28 +731,6 @@ QPropertyChangeHandler QNotifiedProperty::subs return onValueChanged(f); } -template -struct QPropertyMemberChangeHandler; - -template -struct QPropertyMemberChangeHandler : public QPropertyObserver -{ - QPropertyMemberChangeHandler(Class *obj) - : QPropertyObserver(notify) - { - setSource(obj->*PropertyMember); - } - - static void notify(QPropertyObserver *, void *propertyDataPtr) - { - // memberOffset is the offset of the QProperty<> member within the class. We get the absolute address - // of that member and subtracting the relative offset gives us the address of the class instance. - const size_t memberOffset = reinterpret_cast(&(static_cast(nullptr)->*PropertyMember)); - Class *obj = reinterpret_cast(reinterpret_cast(propertyDataPtr) - memberOffset); - (obj->*Callback)(); - } -}; - template class QPropertyAlias : public QPropertyObserver { @@ -892,7 +870,6 @@ public: return aliasedProperty() != nullptr; } }; - QT_END_NAMESPACE #endif // QPROPERTY_H diff --git a/tests/auto/corelib/kernel/qproperty/tst_qproperty.cpp b/tests/auto/corelib/kernel/qproperty/tst_qproperty.cpp index 53d361ca267..cafc1932574 100644 --- a/tests/auto/corelib/kernel/qproperty/tst_qproperty.cpp +++ b/tests/auto/corelib/kernel/qproperty/tst_qproperty.cpp @@ -67,7 +67,6 @@ private slots: void settingPropertyValueDoesRemoveBinding(); void genericPropertyBinding(); void genericPropertyBindingBool(); - void staticChangeHandler(); void setBindingFunctor(); void multipleObservers(); void propertyAlias(); @@ -661,25 +660,6 @@ void tst_QProperty::genericPropertyBindingBool() QVERIFY(property.value()); } -struct ItemType -{ - QProperty x; - QVector observedValues; - void xChanged() { - observedValues << x.value(); - } - QPropertyMemberChangeHandler<&ItemType::x, &ItemType::xChanged> test{this}; -}; - -void tst_QProperty::staticChangeHandler() -{ - ItemType t; - t.x = 42; - t.x = 100; - QVector values{42, 100}; - QCOMPARE(t.observedValues, values); -} - void tst_QProperty::setBindingFunctor() { QProperty property;