From 6fe784b9696fc19eb8f2ba24f187d2cea4434c53 Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Fri, 20 May 2016 11:01:33 +0200 Subject: QQuickStackView: fix build error: no matching function for call to 'QQmlComponentPrivate::initializeObjectWithInitialProperties(QV4::ScopedValue&, QQuickItem*&)' Change-Id: Ied1bd7b73b60c69c73e42b82209f10f2448ce7b0 Reviewed-by: Simon Hausmann --- src/quicktemplates2/qquickstackview_p.cpp | 4 +++- src/quicktemplates2/qquickstackview_p_p.h | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/quicktemplates2/qquickstackview_p.cpp b/src/quicktemplates2/qquickstackview_p.cpp index ca2f5661..9e09c83e 100644 --- a/src/quicktemplates2/qquickstackview_p.cpp +++ b/src/quicktemplates2/qquickstackview_p.cpp @@ -183,7 +183,8 @@ void QQuickStackElement::initialize() Q_ASSERT(v4); QV4::Scope scope(v4); QV4::ScopedValue ipv(scope, properties.value()); - d->initializeObjectWithInitialProperties(ipv, item); + QV4::Scoped qmlContext(scope, qmlCallingContext.value()); + d->initializeObjectWithInitialProperties(qmlContext, ipv, item); properties.clear(); } @@ -282,6 +283,7 @@ static bool initProperties(QQuickStackElement *element, const QV4::Value &props, if (!wrapper) { QV4::ExecutionEngine *v4 = args->v4engine(); element->properties.set(v4, props); + element->qmlCallingContext.set(v4, v4->qmlContext()); return true; } } diff --git a/src/quicktemplates2/qquickstackview_p_p.h b/src/quicktemplates2/qquickstackview_p_p.h index 2c9e6f35..679cee09 100644 --- a/src/quicktemplates2/qquickstackview_p_p.h +++ b/src/quicktemplates2/qquickstackview_p_p.h @@ -98,6 +98,7 @@ public: QPointer originalParent; QQuickStackView::Status status; QV4::PersistentValue properties; + QV4::PersistentValue qmlCallingContext; }; class QQuickStackViewPrivate : public QQuickControlPrivate, public QQuickItemViewTransitionChangeListener -- cgit v1.2.3