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
9be23eb9
Commit
9be23eb9
authored
9 years ago
by
Allan Sandfeld Jensen
Browse files
Options
Download
Plain Diff
Merge remote-tracking branch 'origin/5.6' into dev
Change-Id: I0569b04ced3456a1d5d91e02e117963115fcf1b2
parents
4f2e66f9
981e38d2
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.6
5.7
5.8
5.9
5.9.8
6.2
6.2.0
6.2.1
6.2.2
wip/47-based
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
v5.7.1
v5.7.0
v5.7.0-rc1
v5.7.0-beta1
v5.7.0-alpha1
v5.6.3
No related merge requests found
Changes
88
Hide whitespace changes
Inline
Side-by-side
Showing
20 changed files
examples/webengine/quicknanobrowser/BrowserWindow.qml
+8
-4
examples/webengine/quicknanobrowser/BrowserWindow.qml
examples/webengine/quicknanobrowser/doc/src/quicknanobrowser.qdoc
+1
-1
.../webengine/quicknanobrowser/doc/src/quicknanobrowser.qdoc
examples/webenginewidgets/demobrowser/demobrowser.pro
+1
-1
examples/webenginewidgets/demobrowser/demobrowser.pro
examples/webenginewidgets/demobrowser/doc/src/demobrowser.qdoc
+3
-3
...les/webenginewidgets/demobrowser/doc/src/demobrowser.qdoc
examples/webenginewidgets/demobrowser/tabwidget.cpp
+15
-24
examples/webenginewidgets/demobrowser/tabwidget.cpp
examples/webenginewidgets/demobrowser/tabwidget.h
+2
-1
examples/webenginewidgets/demobrowser/tabwidget.h
examples/webenginewidgets/fancybrowser/doc/src/fancybrowser.qdoc
+11
-11
...s/webenginewidgets/fancybrowser/doc/src/fancybrowser.qdoc
src/3rdparty
+1
-1
src/3rdparty
src/core/api/qwebengineurlrequestinfo.cpp
+13
-1
src/core/api/qwebengineurlrequestinfo.cpp
src/core/api/qwebengineurlrequestinfo.h
+1
-0
src/core/api/qwebengineurlrequestinfo.h
src/core/api/qwebengineurlrequestinfo_p.h
+2
-0
src/core/api/qwebengineurlrequestinfo_p.h
src/core/api/qwebengineurlrequestjob.cpp
+29
-9
src/core/api/qwebengineurlrequestjob.cpp
src/core/api/qwebengineurlrequestjob.h
+2
-12
src/core/api/qwebengineurlrequestjob.h
src/core/api/qwebengineurlschemehandler.cpp
+13
-15
src/core/api/qwebengineurlschemehandler.cpp
src/core/api/qwebengineurlschemehandler.h
+7
-2
src/core/api/qwebengineurlschemehandler.h
src/core/api/qwebengineurlschemehandler_p.h
+5
-14
src/core/api/qwebengineurlschemehandler_p.h
src/core/browser_context_adapter.cpp
+5
-6
src/core/browser_context_adapter.cpp
src/core/browser_context_adapter.h
+4
-4
src/core/browser_context_adapter.h
src/core/config/embedded_linux.pri
+0
-3
src/core/config/embedded_linux.pri
src/core/config/linux.pri
+20
-15
src/core/config/linux.pri
with
143 additions
and
127 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