diff options
| author | Pierre Rossi <pierre.rossi@theqtcompany.com> | 2015-02-18 18:08:14 +0100 |
|---|---|---|
| committer | Pierre Rossi <pierre.rossi@theqtcompany.com> | 2015-02-19 12:20:15 +0000 |
| commit | e263449d32e9392985c1587f2a0b4e0e77e605a2 (patch) | |
| tree | 9c00f24771315c22bf0e228429e6691884ead463 /src/webenginewidgets | |
| parent | b26f697dbed3c2d12db0254a67cdf23396b91c23 (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/webenginewidgets')
| -rw-r--r-- | src/webenginewidgets/api/qwebenginepage.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/webenginewidgets/api/qwebenginepage.cpp b/src/webenginewidgets/api/qwebenginepage.cpp index 7db20fe89..f2cc7e304 100644 --- a/src/webenginewidgets/api/qwebenginepage.cpp +++ b/src/webenginewidgets/api/qwebenginepage.cpp @@ -485,7 +485,7 @@ QWebEngineSettings *QWebEnginePage::settings() const /*! * Returns a pointer to the web channel instance used by this page, or a null pointer if none was set. * This channel is automatically using the internal QtWebEngine transport mechanism over Chromium IPC, - * and exposed in the javascript context of this page as \c navigator.qtWebChannelTransport + * and exposed in the javascript context of this page as \c qt.webChannelTransport * * \since 5.5 * \sa {QtWebChannel::QWebChannel}{QWebChannel} @@ -499,7 +499,7 @@ QWebChannel *QWebEnginePage::webChannel() const /*! * Sets the web channel instance to be used by this page and connects it to QtWebEngine's transport * using Chromium IPC messages. That transport is exposed in the javascript context of this page as - * \c navigator.qtWebChannelTransport, which should be used when using the \l{Qt WebChannel JavaScript API}. + * \c qt.webChannelTransport, which should be used when using the \l{Qt WebChannel JavaScript API}. * * \note The page does not take ownership of the \a channel object. * |