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
bdeb81b7
Commit
bdeb81b7
authored
7 years ago
by
Allan Sandfeld Jensen
Browse files
Options
Download
Plain Diff
Merge remote-tracking branch 'origin/5.9' into 5.10
Change-Id: I0860a46b981c1f711bec45d7a495bcec2a80ee1f
parents
529623a9
c7d46325
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
26
Hide whitespace changes
Inline
Side-by-side
Showing
20 changed files
src/3rdparty
+1
-1
src/3rdparty
src/core/config/linux.pri
+2
-2
src/core/config/linux.pri
src/core/gl_surface_qt.cpp
+6
-0
src/core/gl_surface_qt.cpp
src/core/renderer_host/user_resource_controller_host.cpp
+0
-5
src/core/renderer_host/user_resource_controller_host.cpp
src/core/renderer_host/web_channel_ipc_transport_host.cpp
+10
-4
src/core/renderer_host/web_channel_ipc_transport_host.cpp
src/core/renderer_host/web_channel_ipc_transport_host.h
+1
-0
src/core/renderer_host/web_channel_ipc_transport_host.h
src/core/web_contents_adapter.cpp
+23
-2
src/core/web_contents_adapter.cpp
src/core/web_contents_adapter.h
+3
-1
src/core/web_contents_adapter.h
src/core/web_contents_adapter_client.h
+42
-0
src/core/web_contents_adapter_client.h
src/core/web_contents_view_qt.cpp
+3
-0
src/core/web_contents_view_qt.cpp
src/core/web_engine_context.cpp
+32
-16
src/core/web_engine_context.cpp
src/core/web_engine_context.h
+2
-0
src/core/web_engine_context.h
src/core/web_event_factory.cpp
+2
-3
src/core/web_event_factory.cpp
src/webengine/api/qquickwebengineview.cpp
+4
-2
src/webengine/api/qquickwebengineview.cpp
src/webenginewidgets/api/qwebenginepage.cpp
+6
-4
src/webenginewidgets/api/qwebenginepage.cpp
src/webenginewidgets/api/qwebengineview.cpp
+0
-3
src/webenginewidgets/api/qwebengineview.cpp
src/webenginewidgets/api/qwebengineview_p.h
+0
-1
src/webenginewidgets/api/qwebengineview_p.h
tests/auto/shared/http.pri
+3
-0
tests/auto/shared/http.pri
tests/auto/shared/httpreqrep.cpp
+91
-0
tests/auto/shared/httpreqrep.cpp
tests/auto/shared/httpreqrep.h
+75
-0
tests/auto/shared/httpreqrep.h
with
306 additions
and
44 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