[new compiler] Fix crash in qml delegate model

qmlContext(this) is expected in re-implementations of classBegin(), so just
like the VME we have to be careful that we call it after setting the context
on the ddata.

Change-Id: I38ad8d1a4e4093368f62f9d57718de3b8cd0cfd2
Reviewed-by: Lars Knoll <lars.knoll@digia.com>

1 files changed, 9 insertions, 6 deletions

diff --git a/src/qml/qml/qqmlobjectcreator.cpp b/src/qml/qml/qqmlobjectcreator.cpp
index 933242ba72..02c922f2fb 100644
--- a/src/qml/qml/qqmlobjectcreator.cpp
+++ b/src/qml/qml/qqmlobjectcreator.cpp
@@ -902,6 +902,7 @@ QObject *QmlObjectCreator::createInstance(int index, QObject *parent)
     bool isComponent = false;
     QObject *instance = 0;
     QQmlCustomParser *customParser = 0;
+    QQmlParserStatus *parserStatus = 0;
 
     if (compiledData->isComponent(index)) {
         isComponent = true;
@@ -922,12 +923,8 @@ QObject *QmlObjectCreator::createInstance(int index, QObject *parent)
             }
 
             const int parserStatusCast = type->parserStatusCast();
-            if (parserStatusCast != -1) {
-                QQmlParserStatus *parserStatus = reinterpret_cast<QQmlParserStatus*>(reinterpret_cast<char *>(instance) + parserStatusCast);
-                parserStatus->classBegin();
-                _parserStatusCallbacks[index] = parserStatus;
-                parserStatus->d = &_parserStatusCallbacks[index];
-            }
+            if (parserStatusCast != -1)
+                parserStatus = reinterpret_cast<QQmlParserStatus*>(reinterpret_cast<char *>(instance) + parserStatusCast);
 
             customParser = type->customParser();
 
@@ -977,6 +974,12 @@ QObject *QmlObjectCreator::createInstance(int index, QObject *parent)
 
     ddata->outerContext = context;
 
+    if (parserStatus) {
+        parserStatus->classBegin();
+        _parserStatusCallbacks[index] = parserStatus;
+        parserStatus->d = &_parserStatusCallbacks[index];
+    }
+
     QHash<int, int>::ConstIterator idEntry = objectIndexToId.find(index);
     if (idEntry != objectIndexToId.constEnd())
         context->setIdProperty(idEntry.value(), instance);