Add enum values from related types

If moc marks a type as being related to another type (by using that
type's enums or properties), then include the enum values exported
by the related type in those exposed by the dependent type.

Task-number: QTBUG-22675
Change-Id: I78e72791a4f470200a9ba986a865ffac6c873725
Reviewed-by: Chris Adams <christopher.adams@nokia.com>

1 files changed, 4 insertions, 2 deletions

diff --git a/src/qml/qml/qqmlmetatype_p.h b/src/qml/qml/qqmlmetatype_p.h
index fbbc410c07..fbba733018 100644
--- a/src/qml/qml/qqmlmetatype_p.h
+++ b/src/qml/qml/qqmlmetatype_p.h
@@ -143,6 +143,7 @@ private:
     static CompareFunction anchorLineCompareFunction;
 };
 
+class QHashedCStringRef;
 class QHashedV8String;
 class Q_QML_PRIVATE_EXPORT QQmlType
 {
@@ -191,8 +192,9 @@ public:
 
     int index() const;
 
-    int enumValue(const QHashedStringRef &) const;
-    int enumValue(const QHashedV8String &) const;
+    int enumValue(const QHashedStringRef &, bool *ok) const;
+    int enumValue(const QHashedCStringRef &, bool *ok) const;
+    int enumValue(const QHashedV8String &, bool *ok) const;
 private:
     QQmlType *superType() const;
     friend class QQmlTypePrivate;