summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@theqtcompany.com>2016-01-07 14:42:18 +0100
committerAllan Sandfeld Jensen <allan.jensen@theqtcompany.com>2016-01-07 21:52:46 +0000
commitd85764a55b6ef8c683b1080cfa5a5a7339b005af (patch)
tree49d906b7b91272f415c4fda131f3b854f183f548
parent44dda5d0bd66e222f96cae8524e3c71ce86fea29 (diff)
Ensure contents adapter for running javascript
It should be possible to run javascript on a view being initialized. Change-Id: Ia715bb6b897caa33308f7b042c3aa46aa1b45cd7 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
-rw-r--r--src/webengine/api/qquickwebengineview.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/webengine/api/qquickwebengineview.cpp b/src/webengine/api/qquickwebengineview.cpp
index b00ded4de..bfb98f22b 100644
--- a/src/webengine/api/qquickwebengineview.cpp
+++ b/src/webengine/api/qquickwebengineview.cpp
@@ -1017,8 +1017,7 @@ bool QQuickWebEngineView::canGoForward() const
void QQuickWebEngineView::runJavaScript(const QString &script, const QJSValue &callback)
{
Q_D(QQuickWebEngineView);
- if (!d->adapter)
- return;
+ d->ensureContentsAdapter();
if (!callback.isUndefined()) {
quint64 requestId = d_ptr->adapter->runJavaScriptCallbackResult(script);
d->m_callbacks.insert(requestId, callback);