diff options
| author | Lars Knoll <lars.knoll@theqtcompany.com> | 2015-01-13 09:01:29 +0100 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@digia.com> | 2015-01-13 22:42:04 +0100 |
| commit | 39f1e0d66dc434e764731fbfed29c8fd98d217aa (patch) | |
| tree | d9855dbedd752c23395ccb6d4d3dc8fc3bece254 /src/qml/jsruntime/qv4include.cpp | |
| parent | a38f9ec6c96559efa56e8f7346f74f5990810c3a (diff) | |
Make sure we always have an engine when assigning to a Persistent
This prepares things for a rewrite of the internals of Persistent.
Change-Id: Ib93ec5911984d1bfce87ffdc3f86bc75f6ecafe9
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/qml/jsruntime/qv4include.cpp')
| -rw-r--r-- | src/qml/jsruntime/qv4include.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/qml/jsruntime/qv4include.cpp b/src/qml/jsruntime/qv4include.cpp index 2627e26d4b..56e7717c26 100644 --- a/src/qml/jsruntime/qv4include.cpp +++ b/src/qml/jsruntime/qv4include.cpp @@ -53,11 +53,11 @@ QV4Include::QV4Include(const QUrl &url, QV4::ExecutionEngine *engine, QQmlContex const QV4::ValueRef qmlglobal, const QV4::ValueRef callback) : v4(engine), m_network(0), m_reply(0), m_url(url), m_redirectCount(0), m_context(context) { - m_qmlglobal = qmlglobal; + m_qmlglobal.set(engine, qmlglobal); if (callback->asFunctionObject()) - m_callbackFunction = callback; + m_callbackFunction.set(engine, callback); - m_resultObject = resultValue(v4); + m_resultObject.set(v4, resultValue(v4)); m_network = engine->v8Engine->networkAccessManager(); |