summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/webenginequick/api/qquickwebengineview.cpp6
-rw-r--r--src/webenginequick/api/qquickwebengineview_p.h3
2 files changed, 9 insertions, 0 deletions
diff --git a/src/webenginequick/api/qquickwebengineview.cpp b/src/webenginequick/api/qquickwebengineview.cpp
index d06185380..f0d972448 100644
--- a/src/webenginequick/api/qquickwebengineview.cpp
+++ b/src/webenginequick/api/qquickwebengineview.cpp
@@ -1504,6 +1504,12 @@ bool QQuickWebEngineView::canGoForward() const
return d->adapter->canGoForward();
}
+void QQuickWebEngineView::runJavaScript(const QString &script, const std::function<void(const QVariant &)> &resultCallback)
+{
+ Q_D(QQuickWebEngineView);
+ d->runJavaScript(script, QWebEngineScript::MainWorld, WebContentsAdapter::kUseMainFrameId, resultCallback);
+}
+
void QQuickWebEngineView::runJavaScript(const QString &script, const QJSValue &callback)
{
runJavaScript(script, QWebEngineScript::MainWorld, callback);
diff --git a/src/webenginequick/api/qquickwebengineview_p.h b/src/webenginequick/api/qquickwebengineview_p.h
index e87e507a0..ddbcfe086 100644
--- a/src/webenginequick/api/qquickwebengineview_p.h
+++ b/src/webenginequick/api/qquickwebengineview_p.h
@@ -480,6 +480,9 @@ QT_WARNING_POP
QQuickWebEngineFrame mainFrame();
Q_REVISION(6, 8) Q_INVOKABLE QQuickWebEngineFrame findFrameByName(const QString &name);
+ // Used by QWebView. Not callable through QML
+ void runJavaScript(const QString &script, const std::function<void(const QVariant &)> &resultCallback);
+
public Q_SLOTS:
void runJavaScript(const QString&, const QJSValue & = QJSValue());
Q_REVISION(1,3) void runJavaScript(const QString&, quint32 worldId, const QJSValue & = QJSValue());