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/generator.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/generator.h')
| -rw-r--r-- | src/tools/moc/generator.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/tools/moc/generator.h b/src/tools/moc/generator.h index 725c4ffb12..a01ec5860b 100644 --- a/src/tools/moc/generator.h +++ b/src/tools/moc/generator.h @@ -52,7 +52,7 @@ class Generator ClassDef *cdef; QVector<uint> meta_data; public: - Generator(ClassDef *classDef, const QList<QByteArray> &metaTypes, const QHash<QByteArray, QByteArray> &knownQObjectClasses, FILE *outfile = 0); + Generator(ClassDef *classDef, const QList<QByteArray> &metaTypes, const QHash<QByteArray, QByteArray> &knownQObjectClasses, const QHash<QByteArray, QByteArray> &knownGadgets, FILE *outfile = 0); void generateCode(); private: bool registerableMetaType(const QByteArray &propertyType); @@ -80,6 +80,7 @@ private: QByteArray purestSuperClass; QList<QByteArray> metaTypes; QHash<QByteArray, QByteArray> knownQObjectClasses; + QHash<QByteArray, QByteArray> knownGadgets; }; QT_END_NAMESPACE |