summaryrefslogtreecommitdiffstats
path: root/src/webengine/api/qquickwebengineview.cpp
diff options
context:
space:
mode:
authorJocelyn Turcotte <jocelyn.turcotte@digia.com>2014-05-12 15:10:43 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2014-05-12 19:11:32 +0200
commit55f1130be067fbf32f4be6953d3cea6cb72705b9 (patch)
tree17d7df256cab232a2efc8f61f398df4e2cde7363 /src/webengine/api/qquickwebengineview.cpp
parent6f5e9d0355872be7ab944f08ca1362c6f5bc7879 (diff)
Remove the xPath argument from runJavaScript
This value is only used internally by Chromium and risks being removed at anytime, for which we would then have to maintain a downstream implementation. Chromium also only supports frame values, while a complete support of the interface would require also supporting this xPath to point to individual document element by affecting the value of "this", the same way that QWebElement::evaluateJavaScript allowed in QtWebKit. Change-Id: Id0cb1b8e3bdf9a6db0ca786fb5eb46ffd726d165 Reviewed-by: Michael Bruning <michael.bruning@digia.com>
Diffstat (limited to 'src/webengine/api/qquickwebengineview.cpp')
-rw-r--r--src/webengine/api/qquickwebengineview.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/webengine/api/qquickwebengineview.cpp b/src/webengine/api/qquickwebengineview.cpp
index 0a5150c3..a11a57cd 100644
--- a/src/webengine/api/qquickwebengineview.cpp
+++ b/src/webengine/api/qquickwebengineview.cpp
@@ -550,10 +550,10 @@ QQmlComponent *QQuickWebEngineViewExperimental::extraContextMenuEntriesComponent
void QQuickWebEngineViewExperimental::runJavaScript(const QString &script, const QJSValue &callback)
{
if (!callback.isUndefined()) {
- quint64 requestId = d_ptr->adapter->runJavaScriptCallbackResult(script, /*xPath=*/QString());
+ quint64 requestId = d_ptr->adapter->runJavaScriptCallbackResult(script);
d_ptr->m_callbacks.insert(requestId, callback);
} else
- d_ptr->adapter->runJavaScript(script, /*xPath=*/QString());
+ d_ptr->adapter->runJavaScript(script);
}
QQuickWebEngineHistory *QQuickWebEngineViewExperimental::navigationHistory() const