From 76baa9a0766c938c15ba6d42717e47bea6c22d21 Mon Sep 17 00:00:00 2001 From: Marc Mutz Date: Wed, 4 Dec 2013 15:36:27 +0100 Subject: QQmlMetaType: adapt to upcoming MOC format change A change is pending on qtbase that turns relatedMetaObjects into a const pointer-to-const in order to make the relocation a read-only one. Adapt. Change-Id: I503eca13c1fe80d070e3078620fa3fd5ecdef0b0 Reviewed-by: Olivier Goffart --- src/qml/qml/qqmlmetatype.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/qml/qml/qqmlmetatype.cpp') diff --git a/src/qml/qml/qqmlmetatype.cpp b/src/qml/qml/qqmlmetatype.cpp index ed0c0afd6f..437e920d1a 100644 --- a/src/qml/qml/qqmlmetatype.cpp +++ b/src/qml/qml/qqmlmetatype.cpp @@ -664,7 +664,7 @@ void QQmlTypePrivate::insertEnums(const QMetaObject *metaObject) const { // Add any enum values defined by 'related' classes if (metaObject->d.relatedMetaObjects) { - const QMetaObject **related = metaObject->d.relatedMetaObjects; + const QMetaObject * const *related = metaObject->d.relatedMetaObjects; if (related) { while (*related) insertEnums(*related++); -- cgit v1.2.3