Merge remote-tracking branch 'origin/5.8' into 5.9

Change-Id: Ib3d81ad33a6ba28d891da91271a64d5fcc4874e6

1 files changed, 4 insertions, 7 deletions

diff --git a/src/qml/types/qqmldelegatemodel.cpp b/src/qml/types/qqmldelegatemodel.cpp
index 34bc266cb5..f26e5f6cdb 100644
--- a/src/qml/types/qqmldelegatemodel.cpp
+++ b/src/qml/types/qqmldelegatemodel.cpp
@@ -1964,9 +1964,8 @@ void QQmlDelegateModelItem::destroyObject()
     Q_ASSERT(object);
     Q_ASSERT(contextData);
 
-    QObjectPrivate *p = QObjectPrivate::get(object);
-    Q_ASSERT(p->declarativeData);
-    QQmlData *data = static_cast<QQmlData*>(p->declarativeData);
+    QQmlData *data = QQmlData::get(object);
+    Q_ASSERT(data);
     if (data->ownContext && data->context)
         data->context->clearContext();
     object->deleteLater();
@@ -1983,10 +1982,8 @@ void QQmlDelegateModelItem::destroyObject()
 
 QQmlDelegateModelItem *QQmlDelegateModelItem::dataForObject(QObject *object)
 {
-    QObjectPrivate *p = QObjectPrivate::get(object);
-    QQmlContextData *context = p->declarativeData
-            ? static_cast<QQmlData *>(p->declarativeData)->context
-            : 0;
+    QQmlData *d = QQmlData::get(object);
+    QQmlContextData *context = d ? d->context : 0;
     for (context = context ? context->parent : 0; context; context = context->parent) {
         if (QQmlDelegateModelItem *cacheItem = qobject_cast<QQmlDelegateModelItem *>(
                 context->contextObject)) {