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
ecb537e8
Commit
ecb537e8
authored
7 years ago
by
Allan Sandfeld Jensen
Browse files
Options
Download
Plain Diff
Merge branch '5.9' into 5.10
Change-Id: I9fe9946ba47f9ef509a861963c83e275a25fffd0
parents
9b449045
ad55613c
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
6.2
6.2.0
6.2.1
6.2.2
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
No related merge requests found
Changes
24
Hide whitespace changes
Inline
Side-by-side
Showing
20 changed files
config.tests/re2/re2.cpp
+4
-4
config.tests/re2/re2.cpp
config.tests/re2/re2.pro
+3
-0
config.tests/re2/re2.pro
config.tests/srtp/srtp.pro
+0
-3
config.tests/srtp/srtp.pro
config_help.txt
+13
-0
config_help.txt
configure.json
+12
-0
configure.json
configure.pri
+2
-2
configure.pri
dist/changes-5.6.3
+73
-0
dist/changes-5.6.3
mkspecs/features/configure.prf
+1
-10
mkspecs/features/configure.prf
mkspecs/features/functions.prf
+3
-2
mkspecs/features/functions.prf
qtwebengine.pro
+1
-1
qtwebengine.pro
src/core/config/linux.pri
+6
-2
src/core/config/linux.pri
src/core/delegated_frame_node.cpp
+1
-0
src/core/delegated_frame_node.cpp
src/core/render_widget_host_view_qt.cpp
+15
-3
src/core/render_widget_host_view_qt.cpp
src/core/render_widget_host_view_qt.h
+2
-0
src/core/render_widget_host_view_qt.h
src/core/surface_factory_qt.cpp
+8
-22
src/core/surface_factory_qt.cpp
src/core/web_contents_adapter.cpp
+36
-1
src/core/web_contents_adapter.cpp
src/core/web_contents_adapter.h
+2
-0
src/core/web_contents_adapter.h
src/core/web_contents_adapter_p.h
+2
-0
src/core/web_contents_adapter_p.h
src/core/web_engine_context.cpp
+6
-0
src/core/web_engine_context.cpp
src/core/web_event_factory.cpp
+2
-0
src/core/web_event_factory.cpp
with
192 additions
and
50 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