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
028bd20e
Commit
028bd20e
authored
7 years ago
by
Oswald Buddenhagen
Browse files
Options
Download
Plain Diff
Merge 5.9 into 5.9.0
Change-Id: If450c073521057241f34ed9b9a7f9965c6752a15
parents
4ea591e7
b24a6419
Changes
54
Hide whitespace changes
Inline
Side-by-side
Showing
20 changed files
examples/webenginewidgets/markdowneditor/mainwindow.h
+1
-1
examples/webenginewidgets/markdowneditor/mainwindow.h
examples/webenginewidgets/simplebrowser/browserwindow.cpp
+7
-0
examples/webenginewidgets/simplebrowser/browserwindow.cpp
examples/webenginewidgets/videoplayer/data/index.html
+23
-0
examples/webenginewidgets/videoplayer/data/index.html
examples/webenginewidgets/videoplayer/data/videoplayer.qrc
+5
-0
examples/webenginewidgets/videoplayer/data/videoplayer.qrc
examples/webenginewidgets/videoplayer/doc/images/videoplayer-example.png
+0
-0
...inewidgets/videoplayer/doc/images/videoplayer-example.png
examples/webenginewidgets/videoplayer/doc/src/videoplayer.qdoc
+186
-0
...les/webenginewidgets/videoplayer/doc/src/videoplayer.qdoc
examples/webenginewidgets/videoplayer/fullscreennotification.cpp
+87
-0
...s/webenginewidgets/videoplayer/fullscreennotification.cpp
examples/webenginewidgets/videoplayer/fullscreennotification.h
+61
-0
...les/webenginewidgets/videoplayer/fullscreennotification.h
examples/webenginewidgets/videoplayer/fullscreenwindow.cpp
+88
-0
examples/webenginewidgets/videoplayer/fullscreenwindow.cpp
examples/webenginewidgets/videoplayer/fullscreenwindow.h
+68
-0
examples/webenginewidgets/videoplayer/fullscreenwindow.h
examples/webenginewidgets/videoplayer/main.cpp
+53
-0
examples/webenginewidgets/videoplayer/main.cpp
examples/webenginewidgets/videoplayer/mainwindow.cpp
+72
-0
examples/webenginewidgets/videoplayer/mainwindow.cpp
examples/webenginewidgets/videoplayer/mainwindow.h
+64
-0
examples/webenginewidgets/videoplayer/mainwindow.h
examples/webenginewidgets/videoplayer/videoplayer.pro
+19
-0
examples/webenginewidgets/videoplayer/videoplayer.pro
examples/webenginewidgets/webenginewidgets.pro
+2
-1
examples/webenginewidgets/webenginewidgets.pro
mkspecs/features/configure.prf
+4
-2
mkspecs/features/configure.prf
mkspecs/features/default_pre.prf
+0
-3
mkspecs/features/default_pre.prf
mkspecs/features/functions.prf
+19
-20
mkspecs/features/functions.prf
mkspecs/features/gn_generator.prf
+0
-0
mkspecs/features/gn_generator.prf
qtwebengine.pro
+6
-6
qtwebengine.pro
with
765 additions
and
33 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