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
QtMultimedia
Commits
2972eaa1
Commit
2972eaa1
authored
7 years ago
by
Christian Strømme
Browse files
Options
Download
Plain Diff
Merge remote-tracking branch 'origin/5.9' into 5.10
Change-Id: Ib7c41a4cd7fd6976ebab52673898888dfac53db5
parents
230f070c
51b361fa
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
6.2
6.2.0
6.2.1
6.2.2
wip/cmake
wip/qt6
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
No related merge requests found
Changes
15
Hide whitespace changes
Inline
Side-by-side
Showing
15 changed files
src/gsttools/qgstvideorenderersink.cpp
+2
-4
src/gsttools/qgstvideorenderersink.cpp
src/plugins/qnx/mediaplayer/mediaplayer.pri
+4
-2
src/plugins/qnx/mediaplayer/mediaplayer.pri
src/plugins/qnx/mediaplayer/mmrenderermediaplayercontrol.cpp
+3
-8
src/plugins/qnx/mediaplayer/mmrenderermediaplayercontrol.cpp
src/plugins/qnx/mediaplayer/mmrenderermediaplayercontrol.h
+5
-5
src/plugins/qnx/mediaplayer/mmrenderermediaplayercontrol.h
src/plugins/qnx/mediaplayer/mmrenderermediaplayerservice.cpp
+2
-2
src/plugins/qnx/mediaplayer/mmrenderermediaplayerservice.cpp
src/plugins/qnx/mediaplayer/mmreventmediaplayercontrol.cpp
+154
-0
src/plugins/qnx/mediaplayer/mmreventmediaplayercontrol.cpp
src/plugins/qnx/mediaplayer/mmreventmediaplayercontrol.h
+17
-16
src/plugins/qnx/mediaplayer/mmreventmediaplayercontrol.h
src/plugins/qnx/mediaplayer/mmreventthread.cpp
+121
-0
src/plugins/qnx/mediaplayer/mmreventthread.cpp
src/plugins/qnx/mediaplayer/mmreventthread.h
+79
-0
src/plugins/qnx/mediaplayer/mmreventthread.h
src/plugins/winrt/qwinrtabstractvideorenderercontrol.cpp
+7
-7
src/plugins/winrt/qwinrtabstractvideorenderercontrol.cpp
src/plugins/winrt/qwinrtabstractvideorenderercontrol.h
+0
-16
src/plugins/winrt/qwinrtabstractvideorenderercontrol.h
src/plugins/winrt/qwinrtcameracontrol.cpp
+169
-129
src/plugins/winrt/qwinrtcameracontrol.cpp
src/plugins/winrt/qwinrtcameracontrol.h
+2
-0
src/plugins/winrt/qwinrtcameracontrol.h
tests/auto/integration/qsound/BLACKLIST
+3
-0
tests/auto/integration/qsound/BLACKLIST
tests/auto/integration/qsound/tst_qsound.cpp
+3
-7
tests/auto/integration/qsound/tst_qsound.cpp
with
571 additions
and
196 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