From a4b25aa3c16ba9ce6e2821e591f7c35bf675d961 Mon Sep 17 00:00:00 2001 From: Ulf Hermann Date: Tue, 25 Feb 2020 11:20:07 +0100 Subject: qmltyperegistrar: Correctly collect attached types Their revisions were missing from the qmltypes. Change-Id: Iec7a5ad1c56135c761f6a1fe66904cf25d039850 Reviewed-by: Fabian Kosmale --- src/qmltyperegistrar/qmltypesclassdescription.h | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'src/qmltyperegistrar/qmltypesclassdescription.h') diff --git a/src/qmltyperegistrar/qmltypesclassdescription.h b/src/qmltyperegistrar/qmltypesclassdescription.h index 8f3a6ea124..d468612beb 100644 --- a/src/qmltyperegistrar/qmltypesclassdescription.h +++ b/src/qmltyperegistrar/qmltypesclassdescription.h @@ -49,8 +49,16 @@ struct QmlTypesClassDescription bool isRootClass = false; bool isBuiltin = false; + enum CollectMode { + TopLevel, + SuperClass, + AttachedType + }; + void collect(const QJsonObject *classDef, const QVector &types, - const QVector &foreign, bool topLevel); + const QVector &foreign, CollectMode mode); + void collectAttached(const QString &attached, const QVector &types, + const QVector &foreign); static const QJsonObject *findType(const QVector &types, const QString &name); }; -- cgit v1.2.3