diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2013-12-23 15:16:08 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-12-24 08:10:16 +0100 |
| commit | 2b287c7c210ac708c0f8872e51517e0d46380ad3 (patch) | |
| tree | 42a127faabe1318db2ef18cfdd7dc1ffc6ab58e5 /src/tools/moc/moc.h | |
| parent | d776937df91e46536f404c6868d64016b6038d7b (diff) | |
Fix regression in property handling with enums from gadgets
When declaring a Q_PROPERTY(SomeType::SomeEnum foo ...) and SomeType is not a
QObject but a gadget, then we must still include SomeType's meta object in the
list of related meta objects.
Task-number: QTBUG-35657
Change-Id: I46195140cb5d180c4f03bb1fe06a876e3fe11267
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
Diffstat (limited to 'src/tools/moc/moc.h')
| -rw-r--r-- | src/tools/moc/moc.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/tools/moc/moc.h b/src/tools/moc/moc.h index 4bbdde47dc..e8da24b2bf 100644 --- a/src/tools/moc/moc.h +++ b/src/tools/moc/moc.h @@ -217,6 +217,7 @@ public: QList<QByteArray> metaTypes; // map from class name to fully qualified name QHash<QByteArray, QByteArray> knownQObjectClasses; + QHash<QByteArray, QByteArray> knownGadgets; QMap<QString, QJsonArray> metaArgs; void parse(); |