aboutsummaryrefslogtreecommitdiffstats
path: root/src/qml/qml/qqmlmetatype.cpp
diff options
context:
space:
mode:
authorMarc Mutz <marc.mutz@kdab.com>2013-12-04 15:36:27 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-12-04 15:59:54 +0100
commit76baa9a0766c938c15ba6d42717e47bea6c22d21 (patch)
tree41896b26fc2f5b6f124772a9595700fa94c17223 /src/qml/qml/qqmlmetatype.cpp
parentd489f2f6549a86b3949004d1c8ec68487fc2adb7 (diff)
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 <ogoffart@woboq.com>
Diffstat (limited to 'src/qml/qml/qqmlmetatype.cpp')
-rw-r--r--src/qml/qml/qqmlmetatype.cpp2
1 files changed, 1 insertions, 1 deletions
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++);