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
QtWebView
Commits
5c5c135b
Commit
5c5c135b
authored
8 years ago
by
Liang Qi
Browse files
Options
Download
Plain Diff
Merge remote-tracking branch 'origin/5.7' into 5.8
Change-Id: Ic0a450feecba47e287403582703d82fb48e3a41f
parents
fdf3a401
ba47b1f1
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
dist/changes-5.6.2
+43
-0
dist/changes-5.6.2
dist/changes-5.7.1
+46
-0
dist/changes-5.7.1
src/webview/qquickviewcontroller.cpp
+6
-6
src/webview/qquickviewcontroller.cpp
src/webview/qwebview_webengine.cpp
+45
-76
src/webview/qwebview_webengine.cpp
src/webview/qwebview_webengine_p.h
+13
-1
src/webview/qwebview_webengine_p.h
sync.profile
+0
-12
sync.profile
with
153 additions
and
95 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