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
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
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