Merge remote-tracking branch 'origin/5.4' into 5.5
authorFrederik Gladhorn <frederik.gladhorn@theqtcompany.com>
Tue, 24 Feb 2015 16:38:46 +0000 (17:38 +0100)
committerFrederik Gladhorn <frederik.gladhorn@theqtcompany.com>
Tue, 24 Feb 2015 16:38:46 +0000 (17:38 +0100)
commit39bb642cb297dcd95273ba0dba417beec03e686c
treeae8a58b76224e1ba6a83c00cfdbbb095756213ad
parentf86a3b7bb3a601da9705ef178fda9658cdbfebb0
parentfcf5d826a0e2d3ea6a01bf4c962e0d4fe096d321
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
qtmultimedia.pro
src/gsttools/qgstreamervideowidget.cpp
src/plugins/gstreamer/camerabin/camerabinservice.cpp
src/plugins/gstreamer/camerabin/camerabinservice.h
src/plugins/gstreamer/mediacapture/qgstreamercaptureservice.cpp
src/plugins/gstreamer/mediacapture/qgstreamercaptureservice.h
src/plugins/gstreamer/mediaplayer/qgstreamerplayerservice.cpp
src/plugins/gstreamer/mediaplayer/qgstreamerplayerservice.h