From d85764a55b6ef8c683b1080cfa5a5a7339b005af Mon Sep 17 00:00:00 2001
From: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
Date: Thu, 7 Jan 2016 14:42:18 +0100
Subject: 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>
---
 src/webengine/api/qquickwebengineview.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'src')

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);
-- 
cgit v1.2.3