Merge remote-tracking branch 'origin/5.4' into dev
authorFrederik Gladhorn <frederik.gladhorn@theqtcompany.com>
Fri, 13 Feb 2015 12:10:48 +0000 (13:10 +0100)
committerFrederik Gladhorn <frederik.gladhorn@theqtcompany.com>
Fri, 13 Feb 2015 12:10:48 +0000 (13:10 +0100)
commitf9014d136f504c6377d1329c822f11a8b58ccdbe
tree1c1a752d8ba6b5094b182305d65ca0d0101e1ed0
parentbbfccc713546f9e7341fbe1af7482cafbdc4ea25
parent06259f1dfbd9cb2ebd58bba59381a42dc8a758df
Merge remote-tracking branch 'origin/5.4' into dev

Change-Id: I5575a4ba13212c9bfe73a3de3ef17c6528beafc3
15 files changed:
src/imports/multimedia/qdeclarativecamera.cpp
src/imports/multimedia/qdeclarativecameracapture.cpp
src/multimedia/camera/qcameraimagecapture.cpp
src/multimedia/controls/qcameraimagecapturecontrol.cpp
src/multimedia/doc/src/blackberry.qdoc
src/multimedia/playback/qmediaplayer.cpp
src/multimedia/video/qvideoprobe.cpp
src/multimedia/video/qvideoprobe.h
src/multimediawidgets/qpaintervideosurface.cpp
src/plugins/android/src/mediacapture/qandroidcamerasession.cpp
src/plugins/android/src/mediaplayer/qandroidmediaplayercontrol.cpp
src/plugins/directshow/dsserviceplugin.cpp
src/plugins/windowsaudio/qwindowsaudiodeviceinfo.cpp
src/plugins/windowsaudio/qwindowsaudioinput.cpp
src/plugins/wmf/player/mfplayersession.cpp