1 files changed, 13 insertions, 12 deletions

diff --git a/src/qml/types/qqmldelegatemodel_p_p.h b/src/qml/types/qqmldelegatemodel_p_p.h
index e0416e93ee..68b987a5fa 100644
--- a/src/qml/types/qqmldelegatemodel_p_p.h
+++ b/src/qml/types/qqmldelegatemodel_p_p.h
@@ -69,7 +69,7 @@ class QQmlDelegateModelAttachedMetaObject;
 class QQmlDelegateModelItemMetaType : public QQmlRefCount
 {
 public:
-    QQmlDelegateModelItemMetaType(QV8Engine *engine, QQmlDelegateModel *model, const QStringList &groupNames);
+    QQmlDelegateModelItemMetaType(QV4::ExecutionEngine *engine, QQmlDelegateModel *model, const QStringList &groupNames);
     ~QQmlDelegateModelItemMetaType();
 
     void initializeMetaObject();
@@ -80,7 +80,7 @@ public:
 
     QPointer<QQmlDelegateModel> model;
     const int groupCount;
-    QV8Engine * const v8Engine;
+    QV4::ExecutionEngine * const v4Engine;
     QQmlDelegateModelAttachedMetaObject *metaObject;
     const QStringList groupNames;
     QV4::PersistentValue modelItemProto;
@@ -126,9 +126,9 @@ public:
     virtual void setValue(const QString &role, const QVariant &value) { Q_UNUSED(role); Q_UNUSED(value); }
     virtual bool resolveIndex(const QQmlAdaptorModel &, int) { return false; }
 
-    static QV4::ReturnedValue get_model(const QV4::BuiltinFunction *, QV4::CallData *callData);
-    static QV4::ReturnedValue get_groups(const QV4::BuiltinFunction *, QV4::CallData *callData);
-    static QV4::ReturnedValue set_groups(const QV4::BuiltinFunction *, QV4::CallData *callData);
+    static QV4::ReturnedValue get_model(const QV4::FunctionObject *, const QV4::Value *thisObject, const QV4::Value *argv, int argc);
+    static QV4::ReturnedValue get_groups(const QV4::FunctionObject *, const QV4::Value *thisObject, const QV4::Value *argv, int argc);
+    static QV4::ReturnedValue set_groups(const QV4::FunctionObject *, const QV4::Value *thisObject, const QV4::Value *argv, int argc);
     static QV4::ReturnedValue get_member(QQmlDelegateModelItem *thisItem, uint flag, const QV4::Value &);
     static QV4::ReturnedValue set_member(QQmlDelegateModelItem *thisItem, uint flag, const QV4::Value &arg);
     static QV4::ReturnedValue get_index(QQmlDelegateModelItem *thisItem, uint flag, const QV4::Value &arg);
@@ -182,7 +182,7 @@ class QQDMIncubationTask : public QQmlIncubator
 public:
     QQDMIncubationTask(QQmlDelegateModelPrivate *l, IncubationMode mode)
         : QQmlIncubator(mode)
-        , incubating(0)
+        , incubating(nullptr)
         , vdm(l) {}
 
     void statusChanged(Status) override;
@@ -220,7 +220,7 @@ public:
 
     void setModel(QQmlDelegateModel *model, Compositor::Group group);
     bool isChangedConnected();
-    void emitChanges(QV8Engine *engine);
+    void emitChanges(QV4::ExecutionEngine *engine);
     void emitModelUpdated(bool reset);
 
     void createdPackage(int index, QQuickPackage *package);
@@ -256,7 +256,7 @@ public:
     void connectModel(QQmlAdaptorModel *model);
 
     void requestMoreIfNecessary();
-    QObject *object(Compositor::Group group, int index, bool asynchronous);
+    QObject *object(Compositor::Group group, int index, QQmlIncubator::IncubationMode incubationMode);
     QQmlDelegateModel::ReleaseFlags release(QObject *object);
     QString stringValue(Compositor::Group group, int index, const QString &name);
     void emitCreatedPackage(QQDMIncubationTask *incubationTask, QQuickPackage *package);
@@ -278,12 +278,12 @@ public:
     void itemsInserted(
             const QVector<Compositor::Insert> &inserts,
             QVarLengthArray<QVector<QQmlChangeSet::Change>, Compositor::MaximumGroupCount> *translatedInserts,
-            QHash<int, QList<QQmlDelegateModelItem *> > *movedItems = 0);
+            QHash<int, QList<QQmlDelegateModelItem *> > *movedItems = nullptr);
     void itemsInserted(const QVector<Compositor::Insert> &inserts);
     void itemsRemoved(
             const QVector<Compositor::Remove> &removes,
             QVarLengthArray<QVector<QQmlChangeSet::Change>, Compositor::MaximumGroupCount> *translatedRemoves,
-            QHash<int, QList<QQmlDelegateModelItem *> > *movedItems = 0);
+            QHash<int, QList<QQmlDelegateModelItem *> > *movedItems = nullptr);
     void itemsRemoved(const QVector<Compositor::Remove> &removes);
     void itemsMoved(
             const QVector<Compositor::Remove> &removes, const QVector<Compositor::Insert> &inserts);
@@ -341,7 +341,7 @@ class QQmlPartsModel : public QQmlInstanceModel, public QQmlDelegateModelGroupEm
     Q_OBJECT
     Q_PROPERTY(QString filterOnGroup READ filterGroup WRITE setFilterGroup NOTIFY filterGroupChanged RESET resetFilterGroup)
 public:
-    QQmlPartsModel(QQmlDelegateModel *model, const QString &part, QObject *parent = 0);
+    QQmlPartsModel(QQmlDelegateModel *model, const QString &part, QObject *parent = nullptr);
     ~QQmlPartsModel();
 
     QString filterGroup() const;
@@ -352,11 +352,12 @@ public:
 
     int count() const override;
     bool isValid() const override;
-    QObject *object(int index, bool asynchronous = false) override;
+    QObject *object(int index, QQmlIncubator::IncubationMode incubationMode = QQmlIncubator::AsynchronousIfNested) override;
     ReleaseFlags release(QObject *item) override;
     QString stringValue(int index, const QString &role) override;
     QList<QByteArray> watchedRoles() const { return m_watchedRoles; }
     void setWatchedRoles(const QList<QByteArray> &roles) override;
+    QQmlIncubator::Status incubationStatus(int index) override;
 
     int indexOf(QObject *item, QObject *objectContext) const override;