Skip to content
GitLab
Projects
Groups
Topics
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
BC
public
external
Qt
QtWebEngine
Commits
bd605cd2
Commit
bd605cd2
authored
7 years ago
by
Allan Sandfeld Jensen
Browse files
Options
Download
Plain Diff
Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: I454bb7216b013cc9aa9ee660893fe37034fd50e1
parents
c8bb939e
0cc07329
Changes
32
Hide whitespace changes
Inline
Side-by-side
Showing
20 changed files
examples/webengine/quicknanobrowser/BrowserWindow.qml
+1
-1
examples/webengine/quicknanobrowser/BrowserWindow.qml
examples/webenginewidgets/simplebrowser/doc/src/simplebrowser.qdoc
+9
-7
...webenginewidgets/simplebrowser/doc/src/simplebrowser.qdoc
examples/webenginewidgets/simplebrowser/webview.cpp
+13
-13
examples/webenginewidgets/simplebrowser/webview.cpp
src/core/core_chromium.pri
+2
-0
src/core/core_chromium.pri
src/core/render_view_context_menu_qt.cpp
+224
-0
src/core/render_view_context_menu_qt.cpp
src/core/render_view_context_menu_qt.h
+120
-0
src/core/render_view_context_menu_qt.h
src/core/web_contents_adapter_client.h
+24
-0
src/core/web_contents_adapter_client.h
src/core/web_contents_view_qt.cpp
+12
-0
src/core/web_contents_view_qt.cpp
src/core/web_engine_settings.cpp
+2
-0
src/core/web_engine_settings.cpp
src/core/web_engine_settings.h
+1
-0
src/core/web_engine_settings.h
src/webengine/api/qquickwebenginecontextmenurequest.cpp
+116
-0
src/webengine/api/qquickwebenginecontextmenurequest.cpp
src/webengine/api/qquickwebenginecontextmenurequest_p.h
+38
-0
src/webengine/api/qquickwebenginecontextmenurequest_p.h
src/webengine/api/qquickwebenginesettings.cpp
+25
-0
src/webengine/api/qquickwebenginesettings.cpp
src/webengine/api/qquickwebenginesettings_p.h
+4
-0
src/webengine/api/qquickwebenginesettings_p.h
src/webengine/api/qquickwebengineview.cpp
+204
-121
src/webengine/api/qquickwebengineview.cpp
src/webengine/api/qquickwebengineview_p.h
+2
-0
src/webengine/api/qquickwebengineview_p.h
src/webengine/api/qquickwebengineview_p_p.h
+19
-0
src/webengine/api/qquickwebengineview_p_p.h
src/webengine/doc/src/webengineview_lgpl.qdoc
+4
-0
src/webengine/doc/src/webengineview_lgpl.qdoc
src/webengine/plugin/plugin.cpp
+2
-0
src/webengine/plugin/plugin.cpp
src/webengine/plugin/plugins.qmltypes
+60
-6
src/webengine/plugin/plugins.qmltypes
with
882 additions
and
148 deletions
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment