summaryrefslogtreecommitdiffstats
path: root/src/webengine
diff options
context:
space:
mode:
authorPierre Rossi <pierre.rossi@theqtcompany.com>2015-02-18 18:08:14 +0100
committerPierre Rossi <pierre.rossi@theqtcompany.com>2015-02-19 12:20:15 +0000
commite263449d32e9392985c1587f2a0b4e0e77e605a2 (patch)
tree9c00f24771315c22bf0e228429e6691884ead463 /src/webengine
parentb26f697dbed3c2d12db0254a67cdf23396b91c23 (diff)
WebChannel: don't mess with the navigator object
The navigator object is actually exposed later on from WebCore using a different mechanism, so the V8 extension approach won't work with it. Better take the chrome extensions approach and expose our own. This should "un-break" the part of the web that was broken by eee482929a. Change-Id: I991be2e12bb9ebcf60ace02721497c3fcd923c7f Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
Diffstat (limited to 'src/webengine')
-rw-r--r--src/webengine/api/qquickwebengineview.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/webengine/api/qquickwebengineview.cpp b/src/webengine/api/qquickwebengineview.cpp
index 9bcb7d326..acae4a11b 100644
--- a/src/webengine/api/qquickwebengineview.cpp
+++ b/src/webengine/api/qquickwebengineview.cpp
@@ -819,7 +819,7 @@ QQuickWebEngineHistory *QQuickWebEngineView::navigationHistory() const
*
* The web channel instance used by this view.
* This channel is automatically using the internal QtWebEngine transport mechanism over Chromium IPC,
- * and exposed in the javascript context of the page it is rendering as \c navigator.qtWebChannelTransport.
+ * and exposed in the javascript context of the page it is rendering as \c qt.webChannelTransport.
* This transport object is used when instantiating the JavaScript counterpart of QWebChannel using
* the \l{Qt WebChannel JavaScript API}.
*