diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-09-15 13:37:10 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-09-15 11:47:24 +0000 |
| commit | 175dc7d516740a8964a859e4d7b5daaf41ef98d0 (patch) | |
| tree | 50e31b7bf8b216c00d94051e36ae04d53bdcca52 /src/controls | |
| parent | 5d54fb7b8fe9dd7f9b8c2a21ccd03a4e700efafa (diff) | |
QQuickStackView: fix build
error: no member named 'qmlGlobal' in 'QQmlV4Function'
Change-Id: I45610c13e634b341fe5a77a37a05633f5f211f0c
Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
Diffstat (limited to 'src/controls')
| -rw-r--r-- | src/controls/qquickstackview_p.cpp | 4 | ||||
| -rw-r--r-- | src/controls/qquickstackview_p_p.h | 1 |
2 files changed, 2 insertions, 3 deletions
diff --git a/src/controls/qquickstackview_p.cpp b/src/controls/qquickstackview_p.cpp index 19ab6a39..451e5512 100644 --- a/src/controls/qquickstackview_p.cpp +++ b/src/controls/qquickstackview_p.cpp @@ -41,6 +41,7 @@ #include <QtQml/qqmlcomponent.h> #include <QtQml/qqmlincubator.h> #include <QtQml/private/qqmlcomponent_p.h> +#include <QtQml/private/qqmlengine_p.h> #include <QtQuick/private/qquickanimation_p.h> #include <QtQuick/private/qquicktransition_p.h> #include <QtQuick/private/qquickitemviewtransition_p.h> @@ -166,7 +167,7 @@ void QQuickStackElement::initialize() if (!properties.isUndefined()) { QQmlComponentPrivate *d = QQmlComponentPrivate::get(component); Q_ASSERT(d && d->engine); - QV4::ExecutionEngine *v4 = qmlGlobal.engine(); + QV4::ExecutionEngine *v4 = QQmlEnginePrivate::getV4Engine(d->engine); Q_ASSERT(v4); QV4::Scope scope(v4); QV4::ScopedValue ipv(scope, properties.value()); @@ -258,7 +259,6 @@ static bool initProperties(QQuickStackElement *element, const QV4::Value &props, if (!wrapper) { QV4::ExecutionEngine *v4 = args->v4engine(); element->properties.set(v4, props); - element->qmlGlobal.set(v4, args->qmlGlobal()); return true; } } diff --git a/src/controls/qquickstackview_p_p.h b/src/controls/qquickstackview_p_p.h index 7a185b7c..0e0039b6 100644 --- a/src/controls/qquickstackview_p_p.h +++ b/src/controls/qquickstackview_p_p.h @@ -96,7 +96,6 @@ public: QPointer<QQuickItem> originalParent; QQuickStackView::Status status; QV4::PersistentValue properties; - QV4::PersistentValue qmlGlobal; }; Q_DECLARE_TYPEINFO(QQuickStackElement, Q_COMPLEX_TYPE); |