diff options
Diffstat (limited to 'src')
26 files changed, 94 insertions, 47 deletions
diff --git a/src/core/browser_message_filter_qt.cpp b/src/core/browser_message_filter_qt.cpp index 2f4c5056f..7551e5616 100644 --- a/src/core/browser_message_filter_qt.cpp +++ b/src/core/browser_message_filter_qt.cpp @@ -50,6 +50,11 @@ BrowserMessageFilterQt::BrowserMessageFilterQt(int /*render_process_id*/) { } +// The following is based on chrome/browser/plugins/plugin_info_message_filter.cc: +// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + bool BrowserMessageFilterQt::OnMessageReceived(const IPC::Message& message) { IPC_BEGIN_MESSAGE_MAP(BrowserMessageFilterQt, message) diff --git a/src/core/chrome_qt.gyp b/src/core/chrome_qt.gyp index d7e6cc2e9..f2d7c5831 100644 --- a/src/core/chrome_qt.gyp +++ b/src/core/chrome_qt.gyp @@ -132,8 +132,6 @@ '<(DEPTH)/chrome/browser/printing/print_job_worker_owner.h', '<(DEPTH)/chrome/browser/printing/printer_query.cc', '<(DEPTH)/chrome/browser/printing/printer_query.h', - '<(DEPTH)/extensions/browser/notification_types.h', - '<(DEPTH)/extensions/browser/notification_types.cc', ], 'dependencies': [ '<(chromium_src_dir)/third_party/mojo/mojo_public.gyp:mojo_cpp_bindings', diff --git a/src/core/config/common.pri b/src/core/config/common.pri index 96506cd37..5822bc589 100644 --- a/src/core/config/common.pri +++ b/src/core/config/common.pri @@ -8,3 +8,5 @@ GYP_CONFIG += v8_use_external_startup_data=0 GYP_CONFIG += enable_basic_printing=1 enable_print_preview=0 # WebSpeech requires Google API keys and adds dependencies on speex and flac. GYP_CONFIG += enable_web_speech=0 +# We do not use or even include the extensions +GYP_CONFIG += enable_extensions=0 diff --git a/src/core/content_client_qt.cpp b/src/core/content_client_qt.cpp index fc9a2a283..8a5dde70f 100644 --- a/src/core/content_client_qt.cpp +++ b/src/core/content_client_qt.cpp @@ -58,6 +58,12 @@ #include <QString> #if defined(ENABLE_PLUGINS) + +// The plugin logic is based on chrome/common/chrome_content_client.cc: +// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + #include "content/public/common/pepper_plugin_info.h" #include "ppapi/shared_impl/ppapi_permissions.h" @@ -95,7 +101,6 @@ static QString ppapiPluginsPath() } -// Adopted from chrome_content_client.cc content::PepperPluginInfo CreatePepperFlashInfo(const base::FilePath& path, const std::string& version) { content::PepperPluginInfo plugin; diff --git a/src/core/content_main_delegate_qt.cpp b/src/core/content_main_delegate_qt.cpp index 85eb984a0..5933f873b 100644 --- a/src/core/content_main_delegate_qt.cpp +++ b/src/core/content_main_delegate_qt.cpp @@ -71,6 +71,11 @@ static base::StringPiece PlatformResourceProvider(int key) { return base::StringPiece(); } +// Logging logic is based on chrome/common/logging_chrome.cc: +// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + static logging::LoggingDestination DetermineLogMode(const base::CommandLine& command_line) { #ifdef NDEBUG diff --git a/src/core/media_capture_devices_dispatcher.cpp b/src/core/media_capture_devices_dispatcher.cpp index 4d11277b0..b38e90c69 100644 --- a/src/core/media_capture_devices_dispatcher.cpp +++ b/src/core/media_capture_devices_dispatcher.cpp @@ -88,6 +88,7 @@ base::string16 getContentsUrl(content::WebContents *webContents) return base::UTF8ToUTF16(webContents->GetURL().GetOrigin().spec()); } +// Based on chrome/browser/media/desktop_capture_access_handler.cc: scoped_ptr<content::MediaStreamUI> getDevicesForDesktopCapture(content::MediaStreamDevices &devices, content::DesktopMediaID mediaId , bool captureAudio, bool /*display_notification*/, base::string16 /*application_title*/) { diff --git a/src/core/print_view_manager_base_qt.cpp b/src/core/print_view_manager_base_qt.cpp index 60f166423..3e12901b9 100644 --- a/src/core/print_view_manager_base_qt.cpp +++ b/src/core/print_view_manager_base_qt.cpp @@ -34,6 +34,7 @@ ** ****************************************************************************/ +// This is based on chrome/browser/printing/print_view_manager_base.cc: // Copyright 2013 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. diff --git a/src/core/printing_message_filter_qt.cpp b/src/core/printing_message_filter_qt.cpp index fd6dc0fc2..ba4d5c6e6 100644 --- a/src/core/printing_message_filter_qt.cpp +++ b/src/core/printing_message_filter_qt.cpp @@ -34,6 +34,7 @@ ** ****************************************************************************/ +// Based on chrome/browser/printing/printing_message_filter.cc: // Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. diff --git a/src/core/renderer/content_renderer_client_qt.cpp b/src/core/renderer/content_renderer_client_qt.cpp index f3ac0f7ca..6094be847 100644 --- a/src/core/renderer/content_renderer_client_qt.cpp +++ b/src/core/renderer/content_renderer_client_qt.cpp @@ -202,6 +202,11 @@ bool ContentRendererClientQt::IsLinkVisited(unsigned long long linkHash) return m_visitedLinkSlave->IsVisited(linkHash); } +// The following is based on chrome/renderer/media/chrome_key_systems.cc: +// Copyright 2013 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + #if defined(ENABLE_PEPPER_CDMS) static bool IsPepperCdmAvailable(const std::string& pepper_type, std::vector<base::string16>* additional_param_names, diff --git a/src/core/renderer/pepper/pepper_flash_browser_host_qt.cpp b/src/core/renderer/pepper/pepper_flash_browser_host_qt.cpp index ced7df065..4427a67f2 100644 --- a/src/core/renderer/pepper/pepper_flash_browser_host_qt.cpp +++ b/src/core/renderer/pepper/pepper_flash_browser_host_qt.cpp @@ -37,6 +37,7 @@ ** ****************************************************************************/ +// This is based on chrome/browser/renderer_host/pepper/pepper_flash_browser_host.cc: // Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -70,7 +71,6 @@ using content::RenderProcessHost; namespace QtWebEngineCore { - PepperFlashBrowserHostQt::PepperFlashBrowserHostQt(BrowserPpapiHost* host, PP_Instance instance, PP_Resource resource) diff --git a/src/core/renderer/pepper/pepper_flash_renderer_host_qt.cpp b/src/core/renderer/pepper/pepper_flash_renderer_host_qt.cpp index 40d449b23..37ce4b5f3 100644 --- a/src/core/renderer/pepper/pepper_flash_renderer_host_qt.cpp +++ b/src/core/renderer/pepper/pepper_flash_renderer_host_qt.cpp @@ -37,6 +37,7 @@ ** ****************************************************************************/ +// This is based on chrome/renderer/pepper/pepper_flash_renderer_host.cc: // Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. diff --git a/src/core/renderer/pepper/pepper_host_factory_qt.cpp b/src/core/renderer/pepper/pepper_host_factory_qt.cpp index 75e0b9a5f..9fbd413ef 100644 --- a/src/core/renderer/pepper/pepper_host_factory_qt.cpp +++ b/src/core/renderer/pepper/pepper_host_factory_qt.cpp @@ -37,6 +37,11 @@ ** ****************************************************************************/ +// This is based on chrome/browser/renderer_host/pepper/chrome_browser_pepper_host_factory.cc: +// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + #include "pepper_host_factory_qt.h" #include "build/build_config.h" diff --git a/src/core/renderer/pepper/pepper_isolated_file_system_message_filter.cpp b/src/core/renderer/pepper/pepper_isolated_file_system_message_filter.cpp index 160eaf55b..7e8b2fdda 100644 --- a/src/core/renderer/pepper/pepper_isolated_file_system_message_filter.cpp +++ b/src/core/renderer/pepper/pepper_isolated_file_system_message_filter.cpp @@ -37,6 +37,11 @@ ** ****************************************************************************/ +// This is based on chrome/browser/renderer_host/pepper/pepper_isolated_file_system_message_filter.cc: +// Copyright 2013 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + #include "pepper_isolated_file_system_message_filter.h" #include "base/macros.h" @@ -53,8 +58,6 @@ #include "ppapi/shared_impl/file_system_util.h" #include "storage/browser/fileapi/isolated_context.h" -// The following is based on chrome/browser/renderer_host/pepper/pepper_isolated_file_system_message_filter.cc: - namespace QtWebEngineCore { // static diff --git a/src/core/renderer/pepper/pepper_renderer_host_factory_qt.cpp b/src/core/renderer/pepper/pepper_renderer_host_factory_qt.cpp index 8d1689b0e..636ca12f1 100644 --- a/src/core/renderer/pepper/pepper_renderer_host_factory_qt.cpp +++ b/src/core/renderer/pepper/pepper_renderer_host_factory_qt.cpp @@ -37,6 +37,11 @@ ** ****************************************************************************/ +// This is based on chrome/renderer/pepper/chrome_renderer_pepper_host_factory.cc: +// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + #include "pepper_renderer_host_factory_qt.h" #include "pepper_flash_renderer_host_qt.h" #include "content/public/renderer/renderer_ppapi_host.h" diff --git a/src/core/renderer/render_frame_observer_qt.cpp b/src/core/renderer/render_frame_observer_qt.cpp index 78ba0e9e6..f2285f298 100644 --- a/src/core/renderer/render_frame_observer_qt.cpp +++ b/src/core/renderer/render_frame_observer_qt.cpp @@ -37,6 +37,11 @@ ** ****************************************************************************/ +// This is based on chrome/renderer/pepper/pepper_helper.cc: +// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + #include "render_frame_observer_qt.h" #include "content/public/renderer/renderer_ppapi_host.h" diff --git a/src/core/web_engine_settings.cpp b/src/core/web_engine_settings.cpp index 54c7f7c4f..6c17c3ce9 100644 --- a/src/core/web_engine_settings.cpp +++ b/src/core/web_engine_settings.cpp @@ -222,7 +222,6 @@ void WebEngineSettings::initDefaults(bool offTheRecord) s_defaultAttributes.insert(PluginsEnabled, false); s_defaultAttributes.insert(FullScreenSupportEnabled, false); s_defaultAttributes.insert(ScreenCaptureEnabled, false); - s_defaultAttributes.insert(WebAudioEnabled, false); // The following defaults matches logic in render_view_host_impl.cc // But first we must ensure the WebContext has been initialized QtWebEngineCore::WebEngineContext::current(); @@ -312,7 +311,6 @@ void WebEngineSettings::applySettingsToWebPreferences(content::WebPreferences *p prefs->plugins_enabled = testAttribute(PluginsEnabled); prefs->fullscreen_supported = testAttribute(FullScreenSupportEnabled); prefs->accelerated_2d_canvas_enabled = testAttribute(Accelerated2dCanvasEnabled); - prefs->webaudio_enabled = testAttribute(WebAudioEnabled); prefs->experimental_webgl_enabled = testAttribute(WebGLEnabled); // Fonts settings. diff --git a/src/core/web_engine_settings.h b/src/core/web_engine_settings.h index 3bc108115..b623f1ec2 100644 --- a/src/core/web_engine_settings.h +++ b/src/core/web_engine_settings.h @@ -78,7 +78,6 @@ public: FullScreenSupportEnabled, ScreenCaptureEnabled, WebGLEnabled, - WebAudioEnabled, Accelerated2dCanvasEnabled, AutoLoadIconsForPage, TouchIconsEnabled diff --git a/src/core/yuv_video_node.cpp b/src/core/yuv_video_node.cpp index d5eee474f..f8290878b 100644 --- a/src/core/yuv_video_node.cpp +++ b/src/core/yuv_video_node.cpp @@ -37,6 +37,11 @@ ** ****************************************************************************/ +// Based on cc/output/gl_renderer.cc and cc/output/shader.cc: +// Copyright 2011 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + #include "yuv_video_node.h" #include <QtGui/qopenglcontext.h> diff --git a/src/webengine/api/qquickwebenginesettings.cpp b/src/webengine/api/qquickwebenginesettings.cpp index 73d3e34b9..9096dd604 100644 --- a/src/webengine/api/qquickwebenginesettings.cpp +++ b/src/webengine/api/qquickwebenginesettings.cpp @@ -264,19 +264,6 @@ bool QQuickWebEngineSettings::webGLEnabled() const } /*! - \qmlproperty bool WebEngineSettings::webAudioEnabled - \since QtWebEngine 1.3 - - Enables support for HTML 5 WebAudio. - - Disabled by default. -*/ -bool QQuickWebEngineSettings::webAudioEnabled() const -{ - return d_ptr->testAttribute(WebEngineSettings::WebAudioEnabled); -} - -/*! \qmlproperty bool WebEngineSettings::accelerated2dCanvasEnabled \since QtWebEngine 1.3 @@ -453,14 +440,6 @@ void QQuickWebEngineSettings::setWebGLEnabled(bool on) Q_EMIT webGLEnabledChanged(); } -void QQuickWebEngineSettings::setWebAudioEnabled(bool on) -{ - bool wasOn = d_ptr->testAttribute(WebEngineSettings::WebAudioEnabled); - d_ptr->setAttribute(WebEngineSettings::WebAudioEnabled, on); - if (wasOn != on) - Q_EMIT webAudioEnabledChanged(); -} - void QQuickWebEngineSettings::setAccelerated2dCanvasEnabled(bool on) { bool wasOn = d_ptr->testAttribute(WebEngineSettings::Accelerated2dCanvasEnabled); diff --git a/src/webengine/api/qquickwebenginesettings_p.h b/src/webengine/api/qquickwebenginesettings_p.h index 6a5fd290e..d380ee3d9 100644 --- a/src/webengine/api/qquickwebenginesettings_p.h +++ b/src/webengine/api/qquickwebenginesettings_p.h @@ -79,7 +79,6 @@ class Q_WEBENGINE_PRIVATE_EXPORT QQuickWebEngineSettings : public QObject { Q_PROPERTY(QString defaultTextEncoding READ defaultTextEncoding WRITE setDefaultTextEncoding NOTIFY defaultTextEncodingChanged REVISION 1) Q_PROPERTY(bool screenCaptureEnabled READ screenCaptureEnabled WRITE setScreenCaptureEnabled NOTIFY screenCaptureEnabledChanged REVISION 2) Q_PROPERTY(bool webGLEnabled READ webGLEnabled WRITE setWebGLEnabled NOTIFY webGLEnabledChanged REVISION 2) - Q_PROPERTY(bool webAudioEnabled READ webAudioEnabled WRITE setWebAudioEnabled NOTIFY webAudioEnabledChanged REVISION 2) Q_PROPERTY(bool accelerated2dCanvasEnabled READ accelerated2dCanvasEnabled WRITE setAccelerated2dCanvasEnabled NOTIFY accelerated2dCanvasEnabledChanged REVISION 2) Q_PROPERTY(bool autoLoadIconsForPage READ autoLoadIconsForPage WRITE setAutoLoadIconsForPage NOTIFY autoLoadIconsForPageChanged REVISION 2) Q_PROPERTY(bool touchIconsEnabled READ touchIconsEnabled WRITE setTouchIconsEnabled NOTIFY touchIconsEnabledChanged REVISION 2) @@ -103,7 +102,6 @@ public: QString defaultTextEncoding() const; bool screenCaptureEnabled() const; bool webGLEnabled() const; - bool webAudioEnabled() const; bool accelerated2dCanvasEnabled() const; bool autoLoadIconsForPage() const; bool touchIconsEnabled() const; @@ -124,7 +122,6 @@ public: void setDefaultTextEncoding(QString encoding); void setScreenCaptureEnabled(bool on); void setWebGLEnabled(bool on); - void setWebAudioEnabled(bool on); void setAccelerated2dCanvasEnabled(bool on); void setAutoLoadIconsForPage(bool on); void setTouchIconsEnabled(bool on); @@ -146,7 +143,6 @@ signals: Q_REVISION(1) void defaultTextEncodingChanged(); Q_REVISION(2) void screenCaptureEnabledChanged(); Q_REVISION(2) void webGLEnabledChanged(); - Q_REVISION(2) void webAudioEnabledChanged(); Q_REVISION(2) void accelerated2dCanvasEnabledChanged(); Q_REVISION(2) void autoLoadIconsForPageChanged(); Q_REVISION(2) void touchIconsEnabledChanged(); diff --git a/src/webenginewidgets/api/qwebenginesettings.cpp b/src/webenginewidgets/api/qwebenginesettings.cpp index d1caa4ca5..dfca16287 100644 --- a/src/webenginewidgets/api/qwebenginesettings.cpp +++ b/src/webenginewidgets/api/qwebenginesettings.cpp @@ -83,8 +83,6 @@ static WebEngineSettings::Attribute toWebEngineAttribute(QWebEngineSettings::Web return WebEngineSettings::ScreenCaptureEnabled; case QWebEngineSettings::WebGLEnabled: return WebEngineSettings::WebGLEnabled; - case QWebEngineSettings::WebAudioEnabled: - return WebEngineSettings::WebAudioEnabled; case QWebEngineSettings::Accelerated2dCanvasEnabled: return WebEngineSettings::Accelerated2dCanvasEnabled; case QWebEngineSettings::AutoLoadIconsForPage: diff --git a/src/webenginewidgets/api/qwebenginesettings.h b/src/webenginewidgets/api/qwebenginesettings.h index ea18cf020..eb4bf75ac 100644 --- a/src/webenginewidgets/api/qwebenginesettings.h +++ b/src/webenginewidgets/api/qwebenginesettings.h @@ -64,7 +64,6 @@ public: FullScreenSupportEnabled, ScreenCaptureEnabled, WebGLEnabled, - WebAudioEnabled, Accelerated2dCanvasEnabled, AutoLoadIconsForPage, TouchIconsEnabled diff --git a/src/webenginewidgets/api/qwebengineview.cpp b/src/webenginewidgets/api/qwebengineview.cpp index add2000d1..396e6950d 100644 --- a/src/webenginewidgets/api/qwebengineview.cpp +++ b/src/webenginewidgets/api/qwebengineview.cpp @@ -86,6 +86,7 @@ void QWebEngineViewPrivate::bind(QWebEngineView *view, QWebEnginePage *page) QObject::connect(page, &QWebEnginePage::titleChanged, view, &QWebEngineView::titleChanged); QObject::connect(page, &QWebEnginePage::urlChanged, view, &QWebEngineView::urlChanged); QObject::connect(page, &QWebEnginePage::iconUrlChanged, view, &QWebEngineView::iconUrlChanged); + QObject::connect(page, &QWebEnginePage::iconChanged, view, &QWebEngineView::iconChanged); QObject::connect(page, &QWebEnginePage::loadStarted, view, &QWebEngineView::loadStarted); QObject::connect(page, &QWebEnginePage::loadProgress, view, &QWebEngineView::loadProgress); QObject::connect(page, &QWebEnginePage::loadFinished, view, &QWebEngineView::loadFinished); @@ -121,6 +122,16 @@ QWebEngineViewPrivate::QWebEngineViewPrivate() with which the process terminated. */ +/*! + \fn void QWebEngineView::iconChanged(const QIcon &icon) + \since 5.7 + + This signal is emitted when the icon ("favicon") associated with the + view is changed. The new icon is specified by \a icon. + + \sa icon(), iconUrl(), iconUrlChanged() +*/ + QWebEngineView::QWebEngineView(QWidget *parent) : QWidget(parent) , d_ptr(new QWebEngineViewPrivate) @@ -198,6 +209,20 @@ QUrl QWebEngineView::iconUrl() const return page()->iconUrl(); } +/*! + \property QWebEngineView::icon + \brief the icon associated with the page currently viewed + \since 5.7 + + By default, this property contains a null icon. + + \sa iconChanged(), iconUrl(), iconUrlChanged() +*/ +QIcon QWebEngineView::icon() const +{ + return page()->icon(); +} + bool QWebEngineView::hasSelection() const { return page()->hasSelection(); diff --git a/src/webenginewidgets/api/qwebengineview.h b/src/webenginewidgets/api/qwebengineview.h index 7181509d2..f7e846861 100644 --- a/src/webenginewidgets/api/qwebengineview.h +++ b/src/webenginewidgets/api/qwebengineview.h @@ -58,7 +58,8 @@ class QWEBENGINEWIDGETS_EXPORT QWebEngineView : public QWidget { Q_OBJECT Q_PROPERTY(QString title READ title) Q_PROPERTY(QUrl url READ url WRITE setUrl) - Q_PROPERTY(QUrl iconUrl READ iconUrl) + Q_PROPERTY(QUrl iconUrl READ iconUrl NOTIFY iconUrlChanged) + Q_PROPERTY(QIcon icon READ icon NOTIFY iconChanged) Q_PROPERTY(QString selectedText READ selectedText) Q_PROPERTY(bool hasSelection READ hasSelection) Q_PROPERTY(qreal zoomFactor READ zoomFactor WRITE setZoomFactor) @@ -80,6 +81,7 @@ public: void setUrl(const QUrl &url); QUrl url() const; QUrl iconUrl() const; + QIcon icon() const; bool hasSelection() const; QString selectedText() const; @@ -116,6 +118,7 @@ Q_SIGNALS: void selectionChanged(); void urlChanged(const QUrl&); void iconUrlChanged(const QUrl&); + void iconChanged(const QIcon&); void renderProcessTerminated(QWebEnginePage::RenderProcessTerminationStatus terminationStatus, int exitCode); diff --git a/src/webenginewidgets/doc/src/qwebenginesettings_lgpl.qdoc b/src/webenginewidgets/doc/src/qwebenginesettings_lgpl.qdoc index cb75c69fa..3e0f4cf82 100644 --- a/src/webenginewidgets/doc/src/qwebenginesettings_lgpl.qdoc +++ b/src/webenginewidgets/doc/src/qwebenginesettings_lgpl.qdoc @@ -137,8 +137,6 @@ Enables screen capture in an application. Disabled by default. (Added in Qt 5.7) \value WebGLEnabled Enables support for HTML 5 WebGL. Enabled by default if available. (Added in Qt 5.7) - \value WebAudioEnabled - Enables support for HTML 5 WebAudio. Disabled by default. (Added in Qt 5.7) \value Accelerated2dCanvasEnabled Specifies whether the HTML5 2D canvas should be a OpenGL framebuffer. This makes many painting operations faster, but slows down pixel access. Enabled by default if available. (Added in Qt 5.7) diff --git a/src/webenginewidgets/doc/src/qwebengineview_lgpl.qdoc b/src/webenginewidgets/doc/src/qwebengineview_lgpl.qdoc index 976a1a924..feaa802d7 100644 --- a/src/webenginewidgets/doc/src/qwebengineview_lgpl.qdoc +++ b/src/webenginewidgets/doc/src/qwebengineview_lgpl.qdoc @@ -57,9 +57,11 @@ The title of an HTML document can be accessed with the title() property. Additionally, a web site may specify an icon, which can be accessed - using the iconUrl() property. If the title or the icon changes, the corresponding - titleChanged() and iconUrlChanged() signals will be emitted. The - zoomFactor() property enables zooming the contents of the web page by a scale factor. + using the icon() or its URL using the iconUrl() property. + If the title or the icon changes, the corresponding titleChanged(), iconChanged() + and iconUrlChanged() signals will be emitted. + The zoomFactor() property enables zooming the contents of the web page by a + scale factor. If you require a custom context menu, you can implement it by reimplementing \l{QWidget::}{contextMenuEvent()} and populating your QMenu with the actions @@ -187,9 +189,11 @@ /*! \property QWebEngineView::iconUrl - \brief the URL of the icon associated with the web page currently viewed + \brief the URL of the icon associated with the page currently viewed - \sa iconUrlChanged() + By default, this property contains an empty URL. + + \sa iconUrlChanged(), icon(), iconChanged() */ /*! @@ -329,9 +333,10 @@ /*! \fn void QWebEngineView::iconUrlChanged(const QUrl &url) - This signal is emitted whenever the icon \a url of the view changes. + This signal is emitted when the URL of the icon ("favicon") associated with the + view is changed. The new URL is specified by \a url. - \sa iconUrl() + \sa iconUrl(), icon(), iconChanged() */ /*! |