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
82d00f9d
Commit
82d00f9d
authored
6 years ago
by
Frederik Gladhorn
Browse files
Options
Download
Plain Diff
Merge 5.11 into 5.11.2
Change-Id: Iea03d76799b1e94991e536c056a5b918d63041a4
parents
a3c7fab7
dab4814d
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
v5.11.2
No related merge requests found
Changes
31
Hide whitespace changes
Inline
Side-by-side
Showing
20 changed files
examples/webengine/quicknanobrowser/doc/src/quicknanobrowser.qdoc
+10
-0
.../webengine/quicknanobrowser/doc/src/quicknanobrowser.qdoc
examples/webengine/quicknanobrowser/icons/3rdparty/COPYING
+1
-0
examples/webengine/quicknanobrowser/icons/3rdparty/COPYING
examples/webengine/quicknanobrowser/icons/3rdparty/go-next.png
+0
-0
...les/webengine/quicknanobrowser/icons/3rdparty/go-next.png
examples/webengine/quicknanobrowser/icons/3rdparty/go-previous.png
+0
-0
...webengine/quicknanobrowser/icons/3rdparty/go-previous.png
examples/webengine/quicknanobrowser/icons/3rdparty/process-stop.png
+0
-0
...ebengine/quicknanobrowser/icons/3rdparty/process-stop.png
examples/webengine/quicknanobrowser/icons/3rdparty/qt_attribution.json
+24
-0
...ngine/quicknanobrowser/icons/3rdparty/qt_attribution.json
examples/webengine/quicknanobrowser/icons/3rdparty/view-refresh.png
+0
-0
...ebengine/quicknanobrowser/icons/3rdparty/view-refresh.png
examples/webengine/quicknanobrowser/resources.qrc
+4
-4
examples/webengine/quicknanobrowser/resources.qrc
examples/webenginewidgets/cookiebrowser/3rdparty/COPYING
+1
-0
examples/webenginewidgets/cookiebrowser/3rdparty/COPYING
examples/webenginewidgets/cookiebrowser/3rdparty/qt_attribution.json
+24
-0
...benginewidgets/cookiebrowser/3rdparty/qt_attribution.json
examples/webenginewidgets/cookiebrowser/3rdparty/view-refresh.png
+0
-0
.../webenginewidgets/cookiebrowser/3rdparty/view-refresh.png
examples/webenginewidgets/cookiebrowser/cookiebrowser.qrc
+1
-1
examples/webenginewidgets/cookiebrowser/cookiebrowser.qrc
examples/webenginewidgets/cookiebrowser/doc/src/cookiebrowser.qdoc
+10
-0
...webenginewidgets/cookiebrowser/doc/src/cookiebrowser.qdoc
examples/webenginewidgets/simplebrowser/data/3rdparty/COPYING
+1
-0
...ples/webenginewidgets/simplebrowser/data/3rdparty/COPYING
examples/webenginewidgets/simplebrowser/data/3rdparty/dialog-error.png
+0
-0
...nginewidgets/simplebrowser/data/3rdparty/dialog-error.png
examples/webenginewidgets/simplebrowser/data/3rdparty/edit-clear.png
+0
-0
...benginewidgets/simplebrowser/data/3rdparty/edit-clear.png
examples/webenginewidgets/simplebrowser/data/3rdparty/go-bottom.png
+0
-0
...ebenginewidgets/simplebrowser/data/3rdparty/go-bottom.png
examples/webenginewidgets/simplebrowser/data/3rdparty/go-next.png
+0
-0
.../webenginewidgets/simplebrowser/data/3rdparty/go-next.png
examples/webenginewidgets/simplebrowser/data/3rdparty/go-previous.png
+0
-0
...enginewidgets/simplebrowser/data/3rdparty/go-previous.png
examples/webenginewidgets/simplebrowser/data/3rdparty/process-stop.png
+0
-0
...nginewidgets/simplebrowser/data/3rdparty/process-stop.png
with
76 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
Menu
Explore
Projects
Groups
Topics
Snippets