diff options
author | Simon Hausmann <simon.hausmann@qt.io> | 2020-04-29 15:08:53 +0200 |
---|---|---|
committer | Fabian Kosmale <fabian.kosmale@qt.io> | 2020-06-18 17:26:11 +0200 |
commit | b0f445a1526fa43563522d865c5ad1546201003c (patch) | |
tree | 2b5756a39eaabfa507b3052da9b21fce3cb9ba88 /src/tools/moc/moc.h | |
parent | 31d2804e7a777fa4a41e8011bae3279601b08ff3 (diff) |
Add support for QNotifiedProperty to the moc
Change the meaning of Q_PRIVATE_QPROPERTY to imply that the property is
implemented using a QNotifiedProperty. That requires passing the owner
object instance to the value and binding setters.
Similarly, detect QNotifiedProperty members like QProperty.
Change-Id: If49bbb04c8ccd4a661973888c50d2d556c25034f
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
Diffstat (limited to 'src/tools/moc/moc.h')
-rw-r--r-- | src/tools/moc/moc.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/tools/moc/moc.h b/src/tools/moc/moc.h index 8043a547fc..0e1f33a804 100644 --- a/src/tools/moc/moc.h +++ b/src/tools/moc/moc.h @@ -141,6 +141,7 @@ struct PropertyDef bool final = false; bool required = false; bool isQProperty = false; + bool isQPropertyWithNotifier = false; int location = -1; // token index, used for error reporting @@ -200,7 +201,7 @@ struct ClassDef : BaseDef { QVector<QByteArray> nonClassSignalList; QVector<PropertyDef> propertyList; QVector<PrivateQPropertyDef> privateQProperties; - QSet<QByteArray> qPropertyMembers; + QHash<QByteArray, bool> qPropertyMembersMaybeWithNotifier; int revisionedMethods = 0; bool hasQObject = false; |