diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-11-11 09:08:50 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2016-11-11 12:05:38 +0100 |
| commit | 39f7ce19dbce34dfa7e730d6fa743d88109c3369 (patch) | |
| tree | 8b99513fe8a906807a0e3fac2780b9d1e6a63827 /src/webengine/plugin/plugin.cpp | |
| parent | 6c941affb2dd263d929b69afae3a0b9664869a9d (diff) | |
| parent | 2d49b1b20f3275316310df599f1363ac86b8f078 (diff) | |
Merge remote-tracking branch 'origin/5.7' into 5.8
Conflicts:
src/core/content_browser_client_qt.cpp
src/core/content_browser_client_qt.h
src/core/gl_surface_qt.cpp
src/core/print_view_manager_qt.cpp
src/core/web_contents_delegate_qt.cpp
src/core/web_engine_context.cpp
src/webengine/doc/src/qtwebengine-overview.qdoc
src/webengine/doc/src/qtwebengine-platform-notes.qdoc
src/webenginewidgets/render_widget_host_view_qt_delegate_widget.cpp
src/webenginewidgets/webenginewidgets.pro
sync.profile
Change-Id: I44495f4d899580c882d6b86d68d7f6b77c8e91f6
Diffstat (limited to 'src/webengine/plugin/plugin.cpp')
| -rw-r--r-- | src/webengine/plugin/plugin.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/webengine/plugin/plugin.cpp b/src/webengine/plugin/plugin.cpp index 010215f78..0fd2087d4 100644 --- a/src/webengine/plugin/plugin.cpp +++ b/src/webengine/plugin/plugin.cpp @@ -66,7 +66,7 @@ class QtWebEnginePlugin : public QQmlExtensionPlugin Q_OBJECT Q_PLUGIN_METADATA(IID QQmlExtensionInterface_iid) public: - virtual void initializeEngine(QQmlEngine *engine, const char *uri) + virtual void initializeEngine(QQmlEngine *engine, const char *uri) Q_DECL_OVERRIDE { Q_UNUSED(uri); engine->addImageProvider(QQuickWebEngineFaviconProvider::identifier(), new QQuickWebEngineFaviconProvider); |