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
5b909c1f
Commit
5b909c1f
authored
8 years ago
by
Oswald Buddenhagen
Browse files
Options
Download
Plain Diff
Merge dev into 5.8
Change-Id: I23aa7e41dfbbb7c4e4259a32868e64c58c0a1310
parents
f589b8b4
ac41ad48
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
5.8
5.9
5.9.8
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
v5.10.0-alpha1
v5.9.9
v5.9.8
v5.9.7
v5.9.6
v5.9.5
v5.9.4
v5.9.3
v5.9.2
v5.9.1
v5.9.0
v5.9.0-rc2
v5.9.0-rc1
v5.9.0-beta4
v5.9.0-beta3
v5.9.0-beta2
v5.9.0-beta1
v5.9.0-alpha1
v5.8.0
v5.8.0-rc1
v5.8.0-beta1
v5.8.0-alpha1
No related merge requests found
Changes
19
Hide whitespace changes
Inline
Side-by-side
Showing
19 changed files
src/core/delegated_frame_node.cpp
+1
-1
src/core/delegated_frame_node.cpp
src/webengine/api/qquickwebenginecertificateerror.cpp
+32
-15
src/webengine/api/qquickwebenginecertificateerror.cpp
src/webengine/api/qquickwebenginecontextmenudata.cpp
+8
-8
src/webengine/api/qquickwebenginecontextmenudata.cpp
src/webengine/api/qquickwebenginedownloaditem.cpp
+13
-9
src/webengine/api/qquickwebenginedownloaditem.cpp
src/webengine/api/qquickwebengineloadrequest.cpp
+4
-3
src/webengine/api/qquickwebengineloadrequest.cpp
src/webengine/api/qquickwebengineprofile.cpp
+7
-7
src/webengine/api/qquickwebengineprofile.cpp
src/webengine/api/qquickwebenginescript.cpp
+6
-6
src/webengine/api/qquickwebenginescript.cpp
src/webengine/api/qquickwebengineview.cpp
+0
-20
src/webengine/api/qquickwebengineview.cpp
src/webengine/doc/src/qtwebengine-deploying.qdoc
+119
-12
src/webengine/doc/src/qtwebengine-deploying.qdoc
src/webengine/doc/src/qtwebengine-overview.qdoc
+25
-0
src/webengine/doc/src/qtwebengine-overview.qdoc
src/webengine/doc/src/qtwebengine-platform-notes.qdoc
+0
-13
src/webengine/doc/src/qtwebengine-platform-notes.qdoc
src/webengine/doc/src/qtwebengine-qmlmodule.qdoc
+1
-0
src/webengine/doc/src/qtwebengine-qmlmodule.qdoc
src/webengine/doc/src/webengineview.qdoc
+206
-184
src/webengine/doc/src/webengineview.qdoc
src/webengine/render_widget_host_view_qt_delegate_quick.cpp
+1
-1
src/webengine/render_widget_host_view_qt_delegate_quick.cpp
tests/auto/widgets/qwebenginepage/BLACKLIST
+1
-1
tests/auto/widgets/qwebenginepage/BLACKLIST
tools/qmake/config.tests/libcap/libcap.cpp
+0
-36
tools/qmake/config.tests/libcap/libcap.cpp
tools/qmake/config.tests/libcap/libcap.pro
+0
-3
tools/qmake/config.tests/libcap/libcap.pro
tools/qmake/mkspecs/features/configure.prf
+0
-2
tools/qmake/mkspecs/features/configure.prf
tools/qmake/mkspecs/features/functions.prf
+4
-0
tools/qmake/mkspecs/features/functions.prf
with
428 additions
and
321 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