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
239cd06b
Commit
239cd06b
authored
7 years ago
by
Allan Sandfeld Jensen
Committed by
The Qt Project
7 years ago
Browse files
Options
Download
Plain Diff
Merge "Merge remote-tracking branch 'origin/5.9' into 5.10" into refs/staging/5.10
parents
a96d1fdd
9c5f59d8
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
src/core/download_manager_delegate_qt.cpp
+14
-7
src/core/download_manager_delegate_qt.cpp
src/core/download_manager_delegate_qt.h
+2
-2
src/core/download_manager_delegate_qt.h
src/core/gl_surface_qt.cpp
+1
-1
src/core/gl_surface_qt.cpp
src/core/web_contents_adapter.cpp
+1
-1
src/core/web_contents_adapter.cpp
tests/auto/widgets/qwebenginedownloads/tst_qwebenginedownloads.cpp
+4
-4
...o/widgets/qwebenginedownloads/tst_qwebenginedownloads.cpp
with
22 additions
and
15 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
