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
53df50a0
Commit
53df50a0
authored
6 years ago
by
Qt Forward Merge Bot
Browse files
Options
Download
Plain Diff
Merge remote-tracking branch 'origin/5.11.2' into 5.11
Change-Id: Idee34fa6d4cc54effd84d3b78e3666fa7fcce8db
parents
d4ef262a
6426f1e9
dev
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
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.11.3
No related merge requests found
Changes
9
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
config.tests/xml2/xml2.cpp
+0
-3
config.tests/xml2/xml2.cpp
dist/changes-5.11.2
+78
-0
dist/changes-5.11.2
src/3rdparty
+1
-1
src/3rdparty
src/core/web_engine_context.cpp
+1
-1
src/core/web_engine_context.cpp
src/webengine/api/qquickwebenginescript.cpp
+2
-1
src/webengine/api/qquickwebenginescript.cpp
src/webengine/doc/src/webengineview_lgpl.qdoc
+1
-1
src/webengine/doc/src/webengineview_lgpl.qdoc
src/webenginewidgets/api/qwebenginescript.cpp
+2
-0
src/webenginewidgets/api/qwebenginescript.cpp
src/webenginewidgets/doc/src/qwebenginepage_lgpl.qdoc
+3
-3
src/webenginewidgets/doc/src/qwebenginepage_lgpl.qdoc
tests/auto/widgets/qwebengineview/tst_qwebengineview.cpp
+21
-21
tests/auto/widgets/qwebengineview/tst_qwebengineview.cpp
with
109 additions
and
31 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