diff options
author | Albert Astals Cid <albert.astals@canonical.com> | 2017-03-10 13:14:19 +0100 |
---|---|---|
committer | Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com> | 2017-05-23 11:11:52 +0000 |
commit | 2ca187caa383ddc0cdebeb1dbc312405c8c871ad (patch) | |
tree | 70de643261bb96fd2350b9129d281a780bdbe6b6 /src/tools/moc/moc.h | |
parent | f437fb2934e56c293039dc3b00410c53596f9c3e (diff) |
moc: Allow NOTIFY signals defined in parent classes
Limitation is that the signal needs to be parameter-less
[ChangeLog][moc] moc now supports NOTIFY signals of parent classes in Q_PROPERTY
Change-Id: Iad64c96c3ec65d4be8ad9ff1a9f889938ab9bf45
Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>
Reviewed-by: Brett Stottlemyer <bstottle@ford.com>
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 6040f944f3..5f8cdfcf2c 100644 --- a/src/tools/moc/moc.h +++ b/src/tools/moc/moc.h @@ -121,7 +121,7 @@ struct PropertyDef { PropertyDef():notifyId(-1), constant(false), final(false), gspec(ValueSpec), revision(0){} QByteArray name, type, member, read, write, reset, designable, scriptable, editable, stored, user, notify, inPrivateClass; - int notifyId; + int notifyId; // -1 means no notifyId, >= 0 means signal defined in this class, < -1 means signal not defined in this class bool constant; bool final; enum Specification { ValueSpec, ReferenceSpec, PointerSpec }; @@ -179,6 +179,7 @@ struct ClassDef : BaseDef { QVector<FunctionDef> constructorList; QVector<FunctionDef> signalList, slotList, methodList, publicList; + QVector<QByteArray> nonClassSignalList; int notifyableProperties = 0; QVector<PropertyDef> propertyList; int revisionedMethods = 0; |