diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-05-20 11:01:33 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-05-20 20:22:44 +0000 |
| commit | f3212709f2cb19f61f09ba551934101800586d1a (patch) | |
| tree | 38453edd841312304635cd6ec8815e1f83771298 | |
| parent | d99e10e156f8d87e72cc76a9cb6dfff990eeed4c (diff) | |
QQuickStackView: fix build
error: no matching function for call to 'QQmlComponentPrivate::initializeObjectWithInitialProperties(QV4::ScopedValue&, QQuickItem*&)'
(cherry picked from commit 6fe784b9696fc19eb8f2ba24f187d2cea4434c53)
Change-Id: Ic175bb290dcfbb944fee7545d3b97be8a202896a
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
| -rw-r--r-- | src/templates/qquickstackview_p.cpp | 4 | ||||
| -rw-r--r-- | src/templates/qquickstackview_p_p.h | 1 |
2 files changed, 4 insertions, 1 deletions
diff --git a/src/templates/qquickstackview_p.cpp b/src/templates/qquickstackview_p.cpp index 101f1f68..05558a95 100644 --- a/src/templates/qquickstackview_p.cpp +++ b/src/templates/qquickstackview_p.cpp @@ -179,7 +179,8 @@ void QQuickStackElement::initialize() Q_ASSERT(v4); QV4::Scope scope(v4); QV4::ScopedValue ipv(scope, properties.value()); - d->initializeObjectWithInitialProperties(ipv, item); + QV4::Scoped<QV4::QmlContext> qmlContext(scope, qmlCallingContext.value()); + d->initializeObjectWithInitialProperties(qmlContext, ipv, item); properties.clear(); } @@ -274,6 +275,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/templates/qquickstackview_p_p.h b/src/templates/qquickstackview_p_p.h index d14c6326..97cdb109 100644 --- a/src/templates/qquickstackview_p_p.h +++ b/src/templates/qquickstackview_p_p.h @@ -98,6 +98,7 @@ public: QPointer<QQuickItem> originalParent; QQuickStackView::Status status; QV4::PersistentValue properties; + QV4::PersistentValue qmlCallingContext; }; class QQuickStackViewPrivate : public QQuickControlPrivate, public QQuickItemViewTransitionChangeListener |