diff options
| author | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-02-24 17:38:46 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-02-24 17:38:46 +0100 |
| commit | 39bb642cb297dcd95273ba0dba417beec03e686c (patch) | |
| tree | ae8a58b76224e1ba6a83c00cfdbbb095756213ad /src/plugins/avfoundation/mediaplayer | |
| parent | f86a3b7bb3a601da9705ef178fda9658cdbfebb0 (diff) | |
| parent | fcf5d826a0e2d3ea6a01bf4c962e0d4fe096d321 (diff) | |
Merge remote-tracking branch 'origin/5.4' into 5.5
Conflicts:
qtmultimedia.pro
src/gsttools/qgstreamervideowidget.cpp
src/plugins/gstreamer/camerabin/camerabinservice.cpp
Change-Id: I883f20dc17924ab42514a1aa00d16675a0f13d99
Diffstat (limited to 'src/plugins/avfoundation/mediaplayer')
0 files changed, 0 insertions, 0 deletions