diff options
| author | Ivan Solovev <ivan.solovev@qt.io> | 2020-12-14 12:27:53 +0100 |
|---|---|---|
| committer | Ivan Solovev <ivan.solovev@qt.io> | 2021-04-21 15:34:28 +0200 |
| commit | 1a65a4faf52f83ba3fbbba88cea1c4bb800e8de7 (patch) | |
| tree | 3873a758298aba37faade1b1cd60c755815eae1c /src/corelib/global/qhooks.cpp | |
| parent | 696f5ffc64ac90e92520fd8cf9e8313fe80e3b76 (diff) | |
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 <edward.welbourne@qt.io>
Reviewed-by: Sona Kurazyan <sona.kurazyan@qt.io>
Diffstat (limited to 'src/corelib/global/qhooks.cpp')
| -rw-r--r-- | src/corelib/global/qhooks.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/global/qhooks.cpp b/src/corelib/global/qhooks.cpp index c3a625bb5fa..491e126b7a1 100644 --- a/src/corelib/global/qhooks.cpp +++ b/src/corelib/global/qhooks.cpp @@ -67,7 +67,7 @@ quintptr Q_CORE_EXPORT qtHookData[] = { // The required sizes and offsets are tested in tests/auto/other/toolsupport. // When this fails and the change was intentional, adjust the test and // adjust this value here. - 20 + 21 }; static_assert(QHooks::LastHookIndex == sizeof(qtHookData) / sizeof(qtHookData[0])); |