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
60ee6f64
Commit
60ee6f64
authored
6 years ago
by
Qt Forward Merge Bot
Browse files
Options
Download
Plain Diff
Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: I2442bd4b49e0a322c26d178fdb57d4a51b7a8835
parents
e48a9f0d
e2fb22c1
dev
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
No related merge requests found
Changes
19
Hide whitespace changes
Inline
Side-by-side
Showing
19 changed files
dist/changes-5.11.1
+73
-0
dist/changes-5.11.1
examples/multimedia/audioinput/doc/src/audioinput.qdoc
+1
-1
examples/multimedia/audioinput/doc/src/audioinput.qdoc
src/imports/multimedia/qdeclarativecameracapture.cpp
+1
-1
src/imports/multimedia/qdeclarativecameracapture.cpp
src/imports/multimedia/qdeclarativetorch.cpp
+1
-1
src/imports/multimedia/qdeclarativetorch.cpp
src/multimedia/controls/qcamerafeedbackcontrol.cpp
+1
-1
src/multimedia/controls/qcamerafeedbackcontrol.cpp
src/multimedia/controls/qmediacontainercontrol.cpp
+1
-1
src/multimedia/controls/qmediacontainercontrol.cpp
src/multimedia/doc/qtmultimedia.qdocconf
+2
-1
src/multimedia/doc/qtmultimedia.qdocconf
src/multimedia/doc/snippets/doc_src_qtmultimedia.cpp
+53
-0
src/multimedia/doc/snippets/doc_src_qtmultimedia.cpp
src/multimedia/doc/snippets/doc_src_qtmultimedia.pro
+3
-0
src/multimedia/doc/snippets/doc_src_qtmultimedia.pro
src/multimedia/doc/src/qtmultimedia-cpp.qdoc
+10
-0
src/multimedia/doc/src/qtmultimedia-cpp.qdoc
src/multimediawidgets/doc/snippets/doc_src_qtmultimediawidgets.cpp
+53
-0
...mediawidgets/doc/snippets/doc_src_qtmultimediawidgets.cpp
src/multimediawidgets/doc/snippets/doc_src_qtmultimediawidgets.pro
+3
-0
...mediawidgets/doc/snippets/doc_src_qtmultimediawidgets.pro
src/multimediawidgets/doc/src/qtmultimediawidgets.qdoc
+3
-6
src/multimediawidgets/doc/src/qtmultimediawidgets.qdoc
src/plugins/directshow/player/directshowplayerservice.cpp
+3
-3
src/plugins/directshow/player/directshowplayerservice.cpp
src/plugins/gstreamer/camerabin/camerabinsession.cpp
+13
-5
src/plugins/gstreamer/camerabin/camerabinsession.cpp
src/plugins/winrt/qwinrtcameracontrol.cpp
+2
-0
src/plugins/winrt/qwinrtcameracontrol.cpp
src/plugins/winrt/qwinrtcameravideorenderercontrol.cpp
+6
-0
src/plugins/winrt/qwinrtcameravideorenderercontrol.cpp
src/plugins/winrt/qwinrtcameravideorenderercontrol.h
+3
-0
src/plugins/winrt/qwinrtcameravideorenderercontrol.h
tests/auto/unit/qmediaplaylist/qmediaplaylist.pro
+1
-5
tests/auto/unit/qmediaplaylist/qmediaplaylist.pro
with
233 additions
and
25 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