Merge remote-tracking branch 'origin/5.4' into 5.5
authorLiang Qi <liang.qi@theqtcompany.com>
Wed, 15 Apr 2015 07:26:14 +0000 (09:26 +0200)
committerLiang Qi <liang.qi@theqtcompany.com>
Wed, 15 Apr 2015 07:26:14 +0000 (09:26 +0200)
commit1925bb404ec47b6e074c5e3b334fe0be12176d7b
tree8d7d79ac1b3a549c20bb4fa77c6f457bf1bb61ea
parent6187b72c51d0c05955d9d814baf8866b8e70fcfe
parentf9145aca166ad2ca1514524ce88ded7834eb207c
Merge remote-tracking branch 'origin/5.4' into 5.5

Conflicts:
src/multimedia/playback/playlistfileparser.cpp
src/plugins/windowsaudio/qwindowsaudiodeviceinfo.cpp

Change-Id: I52950def2b8283ae15797d05d4ead6a1256eba19
34 files changed:
examples/multimedia/audioengine/qml/audioengine.qml
examples/multimedia/audioengine/qml/content/MyAudioEngine.qml
src/gsttools/qgstreamervideowidget.cpp
src/imports/audioengine/qdeclarative_audiosample_p.cpp
src/imports/multimedia/multimedia.cpp
src/imports/multimedia/plugins.qmltypes
src/imports/multimedia/qdeclarativecamerarecorder_p.h
src/imports/multimedia/qdeclarativemultimediaglobal.cpp
src/imports/multimedia/qdeclarativemultimediaglobal_p.h
src/imports/multimedia/qdeclarativetorch.cpp
src/multimedia/playback/playlistfileparser.cpp
src/multimedia/playback/playlistfileparser_p.h
src/plugins/avfoundation/camera/avfcameradevicecontrol.mm
src/plugins/avfoundation/camera/avfcameraserviceplugin.mm
src/plugins/avfoundation/camera/avfcamerasession.h
src/plugins/avfoundation/camera/avfcamerasession.mm
src/plugins/coreaudio/coreaudiosessionmanager.mm
src/plugins/directshow/camera/dscamerasession.cpp
src/plugins/directshow/camera/dsvideodevicecontrol.cpp
src/plugins/directshow/camera/dsvideodevicecontrol.h
src/plugins/directshow/dsserviceplugin.cpp
src/plugins/directshow/dsserviceplugin.h
src/plugins/qnx/mediaplayer/mmrenderermetadatareadercontrol.cpp
src/plugins/windowsaudio/qwindowsaudiodeviceinfo.cpp
src/plugins/windowsaudio/qwindowsaudiodeviceinfo.h
src/plugins/windowsaudio/qwindowsaudioinput.cpp
src/plugins/windowsaudio/qwindowsaudioinput.h
src/plugins/windowsaudio/qwindowsaudiooutput.cpp
src/plugins/windowsaudio/qwindowsaudiooutput.h
src/plugins/wmf/decoder/mfaudiodecodercontrol.cpp
src/plugins/wmf/player/mfplayerservice.cpp
src/plugins/wmf/player/mfplayersession.cpp
src/plugins/wmf/player/mfvideorenderercontrol.cpp
src/qtmultimediaquicktools/qsgvideonode_rgb.cpp