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
91679cda
Commit
91679cda
authored
8 years ago
by
Allan Sandfeld Jensen
Committed by
The Qt Project
8 years ago
Browse files
Options
Download
Plain Diff
Merge "Merge remote-tracking branch 'origin/5.6' into 5.7" into refs/staging/5.7
parents
a4c0485b
712c1078
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
src/core/resource_dispatcher_host_delegate_qt.h
+1
-1
src/core/resource_dispatcher_host_delegate_qt.h
src/webengine/api/qquickwebenginedownloaditem.cpp
+3
-3
src/webengine/api/qquickwebenginedownloaditem.cpp
src/webengine/api/qquickwebengineprofile.cpp
+5
-5
src/webengine/api/qquickwebengineprofile.cpp
src/webengine/api/qquickwebenginesettings.cpp
+1
-1
src/webengine/api/qquickwebenginesettings.cpp
src/webengine/api/qquickwebengineview.cpp
+4
-2
src/webengine/api/qquickwebengineview.cpp
with
14 additions
and
12 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