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
eccf02a0
Commit
eccf02a0
authored
8 years ago
by
Liang Qi
Browse files
Options
Download
Plain Diff
Merge remote-tracking branch 'origin/5.8' into dev
Change-Id: Ic36a80502730d404ab96dfa11ff1eb0ac6eb302d
parents
ebc88886
35c38346
Changes
9
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
src/core/render_widget_host_view_qt.cpp
+37
-21
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/web_contents_adapter.cpp
+50
-16
src/core/web_contents_adapter.cpp
src/core/web_contents_adapter_p.h
+3
-0
src/core/web_contents_adapter_p.h
src/core/web_event_factory.cpp
+9
-0
src/core/web_event_factory.cpp
src/webengine/api/qquickwebengineview.cpp
+7
-2
src/webengine/api/qquickwebengineview.cpp
tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp
+0
-83
tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp
tests/auto/widgets/qwebengineview/tst_qwebengineview.cpp
+100
-0
tests/auto/widgets/qwebengineview/tst_qwebengineview.cpp
tools/qmake/mkspecs/features/functions.prf
+5
-0
tools/qmake/mkspecs/features/functions.prf
with
213 additions
and
122 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
