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
60f2cfe3
Commit
60f2cfe3
authored
7 years ago
by
Liang Qi
Browse files
Options
Download
Plain Diff
Merge remote-tracking branch 'origin/5.10.1' into 5.11
Change-Id: If971fbfcb158c921e2328dfcdef3bd3322f30c4b
parents
271e3cd4
9dc8dff7
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
dist/changes-5.10.1
+66
-0
dist/changes-5.10.1
examples/webengine/quicknanobrowser/ApplicationRoot.qml
+1
-1
examples/webengine/quicknanobrowser/ApplicationRoot.qml
src/core/browser_context_adapter.cpp
+1
-1
src/core/browser_context_adapter.cpp
src/core/config/linux.pri
+2
-2
src/core/config/linux.pri
src/core/web_engine_context.cpp
+3
-0
src/core/web_engine_context.cpp
tests/auto/widgets/qwebenginedownloads/BLACKLIST
+4
-0
tests/auto/widgets/qwebenginedownloads/BLACKLIST
tests/auto/widgets/qwebenginedownloads/tst_qwebenginedownloads.cpp
+6
-1
...o/widgets/qwebenginedownloads/tst_qwebenginedownloads.cpp
with
83 additions
and
5 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