From 1a65a4faf52f83ba3fbbba88cea1c4bb800e8de7 Mon Sep 17 00:00:00 2001 From: Ivan Solovev Date: Mon, 14 Dec 2020 12:27:53 +0100 Subject: QObject: port to new property system Extended QObjectPrivate::ExtraData to store a pointer to its parent, and reimplemented qGetBindingStorage() function for QObjectPrivate::ExtraData. This allows to use Q_OBJECT_COMPAT_PROPERTY macro for a property, stored in QObjectPrivate::ExtraData and solves all the problems with calling a custom setter. Task-number: QTBUG-85520 Change-Id: I40e01c29430846359ef9160fa1ae97c702be9a18 Reviewed-by: Edward Welbourne Reviewed-by: Sona Kurazyan --- tests/auto/other/toolsupport/tst_toolsupport.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tests/auto/other/toolsupport/tst_toolsupport.cpp') diff --git a/tests/auto/other/toolsupport/tst_toolsupport.cpp b/tests/auto/other/toolsupport/tst_toolsupport.cpp index 2e46f022e7..7ba4286a4d 100644 --- a/tests/auto/other/toolsupport/tst_toolsupport.cpp +++ b/tests/auto/other/toolsupport/tst_toolsupport.cpp @@ -109,7 +109,7 @@ void tst_toolsupport::offsets_data() QTestData &data = QTest::newRow("sizeof(QObjectPrivate::ExtraData)") << sizeof(QObjectPrivate::ExtraData); // Please heed the comment at the top of this file when changing this line: - data << 60 << 120; // 4 * QList + 1 * QString + data << 64 << 128; // 4 * QList + 1 * QString + ptr } #if RUN_MEMBER_OFFSET_TEST -- cgit v1.2.3