Skip to content
GitLab
Explore
Projects
Groups
Topics
Snippets
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
e53ddd7b
Commit
e53ddd7b
authored
9 years ago
by
Allan Sandfeld Jensen
Browse files
Options
Download
Plain Diff
Merge branch '5.5' into 5.6
Change-Id: I9977663123560a22f493b8c02d02de8897b38666
parents
13d03ef2
dd7b4093
dev
5.10
5.11
5.12
5.12.1
5.12.10
5.12.11
5.12.12
5.12.2
5.12.3
5.12.4
5.12.5
5.12.6
5.12.7
5.12.8
5.12.9
5.13
5.13.0
5.13.1
5.13.2
5.14
5.14.0
5.14.1
5.14.2
5.15
5.15.0
5.15.1
5.15.2
5.15.3
5.15.4
5.15.5
5.15.6
5.15.7
5.6
5.7
5.8
5.9
5.9.8
6.2
6.2.0
6.2.1
6.2.2
wip/47-based
wip/qtpdf
v5.15.0-alpha1
v5.14.1
v5.14.0
v5.14.0-rc2
v5.14.0-rc1
v5.14.0-beta3
v5.14.0-beta2
v5.14.0-beta1
v5.14.0-alpha1
v5.13.2
v5.13.1
v5.13.0
v5.13.0-rc3
v5.13.0-rc2
v5.13.0-rc1
v5.13.0-beta4
v5.13.0-beta3
v5.13.0-beta2
v5.13.0-beta1
v5.13.0-alpha1
v5.12.7
v5.12.6
v5.12.5
v5.12.4
v5.12.3
v5.12.2
v5.12.1
v5.12.0
v5.12.0-rc2
v5.12.0-rc1
v5.12.0-beta4
v5.12.0-beta3
v5.12.0-beta2
v5.12.0-beta1
v5.12.0-alpha1
v5.11.3
v5.11.2
v5.11.1
v5.11.0
v5.11.0-rc2
v5.11.0-rc1
v5.11.0-beta4
v5.11.0-beta3
v5.11.0-beta2
v5.11.0-beta1
v5.11.0-alpha1
v5.10.1
v5.10.0
v5.10.0-rc3
v5.10.0-rc2
v5.10.0-rc1
v5.10.0-beta4
v5.10.0-beta3
v5.10.0-beta2
v5.10.0-beta1
v5.10.0-alpha1
v5.9.9
v5.9.8
v5.9.7
v5.9.6
v5.9.5
v5.9.4
v5.9.3
v5.9.2
v5.9.1
v5.9.0
v5.9.0-rc2
v5.9.0-rc1
v5.9.0-beta4
v5.9.0-beta3
v5.9.0-beta2
v5.9.0-beta1
v5.9.0-alpha1
v5.8.0
v5.8.0-rc1
v5.8.0-beta1
v5.8.0-alpha1
v5.7.1
v5.7.0
v5.7.0-rc1
v5.7.0-beta1
v5.7.0-alpha1
v5.6.3
v5.6.2
v5.6.1
v5.6.1-1
v5.6.0
v5.6.0-rc1
v5.6.0-beta1
v5.6.0-alpha1
No related merge requests found
Changes
78
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
20 changed files
LICENSE.GPLv3
+686
-0
LICENSE.GPLv3
LICENSE.LGPLv3
+12
-0
LICENSE.LGPLv3
examples/webenginewidgets/browser/history.cpp
+2
-15
examples/webenginewidgets/browser/history.cpp
examples/webenginewidgets/browser/history.h
+1
-10
examples/webenginewidgets/browser/history.h
examples/webenginewidgets/browser/tabwidget.cpp
+2
-7
examples/webenginewidgets/browser/tabwidget.cpp
src/core/certificate_error_controller_p.h
+11
-0
src/core/certificate_error_controller_p.h
src/core/clipboard_qt.cpp
+1
-1
src/core/clipboard_qt.cpp
src/core/content_browser_client_qt.cpp
+4
-0
src/core/content_browser_client_qt.cpp
src/core/core_module.pro
+3
-1
src/core/core_module.pro
src/core/custom_protocol_handler.cpp
+5
-5
src/core/custom_protocol_handler.cpp
src/core/custom_protocol_handler.h
+5
-5
src/core/custom_protocol_handler.h
src/core/custom_url_scheme_handler.cpp
+5
-5
src/core/custom_url_scheme_handler.cpp
src/core/custom_url_scheme_handler.h
+5
-5
src/core/custom_url_scheme_handler.h
src/core/gl_context_qt.cpp
+5
-1
src/core/gl_context_qt.cpp
src/core/gl_surface_qt.cpp
+0
-6
src/core/gl_surface_qt.cpp
src/core/javascript_dialog_controller_p.h
+11
-0
src/core/javascript_dialog_controller_p.h
src/core/qtwebengine.gypi
+9
-0
src/core/qtwebengine.gypi
src/core/resource_bundle_qt.cpp
+3
-1
src/core/resource_bundle_qt.cpp
src/core/resources/repack_resources.gypi
+1
-11
src/core/resources/repack_resources.gypi
src/core/resources/resources.gyp
+50
-2
src/core/resources/resources.gyp
with
821 additions
and
75 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
Menu
Explore
Projects
Groups
Topics
Snippets