summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPierre Rossi <pierre.rossi@digia.com>2014-08-21 17:40:54 +0200
committerJocelyn Turcotte <jocelyn.turcotte@digia.com>2014-08-28 19:06:29 +0200
commitad11d3d25bd8a52a1b36cb3210546562382b64c5 (patch)
tree736096b963592eb4d1ae339e77048050d4603914
parent989cccbe2ca07c4950d088dd58247ebd1b4f6753 (diff)
Cleanup use of QJSValue::engine()
Not only this causes warnings because it is deprecated, it lead to a crash in our QML tests when the callback fails to return a valid engine instance. Change-Id: I9412f138f87c39fbee8dbb6121a5bf0a69dcfbb4 Reviewed-by: Andras Becsi <andras.becsi@digia.com> Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
-rw-r--r--src/webengine/api/qquickwebengineview.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/webengine/api/qquickwebengineview.cpp b/src/webengine/api/qquickwebengineview.cpp
index efc9cf0b3..97ea61efd 100644
--- a/src/webengine/api/qquickwebengineview.cpp
+++ b/src/webengine/api/qquickwebengineview.cpp
@@ -563,9 +563,10 @@ void QQuickWebEngineView::stop()
void QQuickWebEngineViewPrivate::didRunJavaScript(quint64 requestId, const QVariant &result)
{
+ Q_Q(QQuickWebEngineView);
QJSValue callback = m_callbacks.take(requestId);
QJSValueList args;
- args.append(callback.engine()->toScriptValue(result));
+ args.append(qmlEngine(q)->toScriptValue(result));
callback.call(args);
}