Merge remote-tracking branch 'origin/stable' into dev
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Tue, 19 Feb 2013 16:14:43 +0000 (17:14 +0100)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>
Tue, 19 Feb 2013 16:15:56 +0000 (17:15 +0100)
commitd396262bc9771cacbc71e79215768984fa1974ff
treee029399524feabed6ebe0ee1e010af9f5e58932d
parent0ce2cb3ebe6289e3db14438560fa186d9e5186b8
parent2db2cde0d8433ad1aed59412717c4cddf496ba66
Merge remote-tracking branch 'origin/stable' into dev

Conflicts:
src/multimedia/doc/qtmultimedia.qdocconf
src/plugins/blackberry/mediaplayer/bbmetadata.cpp
src/plugins/blackberry/mediaplayer/bbmetadata.h
tests/auto/unit/qpaintervideosurface/tst_qpaintervideosurface.cpp

Change-Id: I447c297ea15a94d1d2feb0fb5f9edac8c5d4505a
171 files changed:
src/imports/audioengine/qaudioengine_openal_p.h
src/imports/audioengine/qaudioengine_p.h
src/imports/audioengine/qdeclarative_attenuationmodel_p.h
src/imports/audioengine/qdeclarative_audiocategory_p.h
src/imports/audioengine/qdeclarative_audioengine_p.h
src/imports/audioengine/qdeclarative_audiolistener_p.h
src/imports/audioengine/qdeclarative_audiosample_p.h
src/imports/audioengine/qdeclarative_playvariation_p.h
src/imports/audioengine/qdeclarative_sound_p.h
src/imports/audioengine/qdeclarative_soundinstance_p.h
src/imports/audioengine/qsoundbuffer_p.h
src/imports/audioengine/qsoundinstance_p.h
src/imports/audioengine/qsoundsource_p.h
src/imports/multimedia/qdeclarativeaudio_p.h
src/imports/multimedia/qdeclarativecamera_p.h
src/imports/multimedia/qdeclarativecameracapture_p.h
src/imports/multimedia/qdeclarativecameraexposure_p.h
src/imports/multimedia/qdeclarativecameraflash_p.h
src/imports/multimedia/qdeclarativecamerafocus_p.h
src/imports/multimedia/qdeclarativecameraimageprocessing_p.h
src/imports/multimedia/qdeclarativecamerapreviewprovider_p.h
src/imports/multimedia/qdeclarativecamerarecorder_p.h
src/imports/multimedia/qdeclarativemediametadata_p.h
src/imports/multimedia/qdeclarativeradio_p.h
src/imports/multimedia/qdeclarativeradiodata_p.h
src/imports/multimedia/qdeclarativetorch_p.h
src/multimedia/audio/qaudio.h
src/multimedia/audio/qaudio_mac_p.h
src/multimedia/audio/qaudiobuffer.h
src/multimedia/audio/qaudiobuffer_p.h
src/multimedia/audio/qaudiodecoder.h
src/multimedia/audio/qaudiodevicefactory_p.h
src/multimedia/audio/qaudiodeviceinfo.h
src/multimedia/audio/qaudiodeviceinfo_alsa_p.h
src/multimedia/audio/qaudiodeviceinfo_mac_p.h
src/multimedia/audio/qaudiodeviceinfo_win32_p.h
src/multimedia/audio/qaudioformat.h
src/multimedia/audio/qaudioinput.h
src/multimedia/audio/qaudioinput_alsa_p.h
src/multimedia/audio/qaudioinput_mac_p.h
src/multimedia/audio/qaudioinput_win32_p.cpp
src/multimedia/audio/qaudioinput_win32_p.h
src/multimedia/audio/qaudiooutput.h
src/multimedia/audio/qaudiooutput_alsa_p.h
src/multimedia/audio/qaudiooutput_mac_p.h
src/multimedia/audio/qaudiooutput_win32_p.cpp
src/multimedia/audio/qaudiooutput_win32_p.h
src/multimedia/audio/qaudioprobe.h
src/multimedia/audio/qaudiosystem.h
src/multimedia/audio/qaudiosystemplugin.h
src/multimedia/audio/qsamplecache_p.h
src/multimedia/audio/qsound.h
src/multimedia/audio/qsoundeffect.h
src/multimedia/audio/qsoundeffect_pulse_p.h
src/multimedia/audio/qsoundeffect_qaudio_p.h
src/multimedia/audio/qwavedecoder_p.h
src/multimedia/camera/qcamera.h
src/multimedia/camera/qcameraexposure.h
src/multimedia/camera/qcamerafocus.h
src/multimedia/camera/qcameraimagecapture.h
src/multimedia/camera/qcameraimageprocessing.h
src/multimedia/controls/qaudiodecodercontrol.h
src/multimedia/controls/qaudioencodersettingscontrol.h
src/multimedia/controls/qaudioinputselectorcontrol.h
src/multimedia/controls/qaudiooutputselectorcontrol.h
src/multimedia/controls/qcameracapturebufferformatcontrol.h
src/multimedia/controls/qcameracapturedestinationcontrol.h
src/multimedia/controls/qcameracontrol.h
src/multimedia/controls/qcameraexposurecontrol.h
src/multimedia/controls/qcamerafeedbackcontrol.h
src/multimedia/controls/qcameraflashcontrol.h
src/multimedia/controls/qcamerafocuscontrol.h
src/multimedia/controls/qcameraimagecapturecontrol.h
src/multimedia/controls/qcameraimageprocessingcontrol.h
src/multimedia/controls/qcameralockscontrol.h
src/multimedia/controls/qcameraviewfindersettingscontrol.h
src/multimedia/controls/qcamerazoomcontrol.h
src/multimedia/controls/qimageencodercontrol.h
src/multimedia/controls/qmediaaudioprobecontrol.h
src/multimedia/controls/qmediaavailabilitycontrol.h
src/multimedia/controls/qmediacontainercontrol.h
src/multimedia/controls/qmediagaplessplaybackcontrol.h
src/multimedia/controls/qmedianetworkaccesscontrol.h
src/multimedia/controls/qmediaplayercontrol.h
src/multimedia/controls/qmediaplaylistcontrol_p.h
src/multimedia/controls/qmediaplaylistsourcecontrol_p.h
src/multimedia/controls/qmediarecordercontrol.h
src/multimedia/controls/qmediastreamscontrol.h
src/multimedia/controls/qmediavideoprobecontrol.h
src/multimedia/controls/qmetadatareadercontrol.h
src/multimedia/controls/qmetadatawritercontrol.h
src/multimedia/controls/qradiodatacontrol.h
src/multimedia/controls/qradiotunercontrol.h
src/multimedia/controls/qvideodeviceselectorcontrol.h
src/multimedia/controls/qvideoencodersettingscontrol.h
src/multimedia/controls/qvideorenderercontrol.h
src/multimedia/controls/qvideowindowcontrol.h
src/multimedia/doc/src/blackberry.qdoc
src/multimedia/playback/playlistfileparser_p.h
src/multimedia/playback/qmediacontent.h
src/multimedia/playback/qmedianetworkplaylistprovider_p.h
src/multimedia/playback/qmediaplayer.h
src/multimedia/playback/qmediaplaylist.h
src/multimedia/playback/qmediaplaylist_p.h
src/multimedia/playback/qmediaplaylistioplugin_p.h
src/multimedia/playback/qmediaplaylistnavigator_p.h
src/multimedia/playback/qmediaplaylistprovider_p.h
src/multimedia/playback/qmediaresource.h
src/multimedia/qmediabindableinterface.h
src/multimedia/qmediacontrol.h
src/multimedia/qmediacontrol_p.h
src/multimedia/qmediaenumdebug.h
src/multimedia/qmediametadata.h
src/multimedia/qmediaobject.h
src/multimedia/qmediaobject_p.h
src/multimedia/qmediapluginloader_p.h
src/multimedia/qmediaresourcepolicy_p.h
src/multimedia/qmediaresourcepolicyplugin_p.h
src/multimedia/qmediaresourceset_p.h
src/multimedia/qmediaservice.h
src/multimedia/qmediaservice_p.h
src/multimedia/qmediaserviceprovider_p.h
src/multimedia/qmediaserviceproviderplugin.h
src/multimedia/qmediatimerange.h
src/multimedia/qmultimedia.h
src/multimedia/qtmultimediadefs.h
src/multimedia/qtmultimediaquicktools_headers/qsgvideonode_p.h
src/multimedia/qtmultimediaquicktools_headers/qtmultimediaquickdefs_p.h
src/multimedia/radio/qradiodata.h
src/multimedia/radio/qradiotuner.h
src/multimedia/recording/qaudiorecorder.h
src/multimedia/recording/qmediaencodersettings.h
src/multimedia/recording/qmediarecorder.h
src/multimedia/video/qabstractvideobuffer.h
src/multimedia/video/qabstractvideobuffer_p.h
src/multimedia/video/qabstractvideosurface.h
src/multimedia/video/qimagevideobuffer_p.h
src/multimedia/video/qmemoryvideobuffer_p.h
src/multimedia/video/qvideoframe.h
src/multimedia/video/qvideoprobe.h
src/multimedia/video/qvideosurfaceformat.h
src/multimedia/video/qvideosurfaceoutput_p.h
src/multimediawidgets/qcameraviewfinder.h
src/multimediawidgets/qeglimagetexturesurface_p.h
src/multimediawidgets/qgraphicsvideoitem.h
src/multimediawidgets/qpaintervideosurface_mac_p.h
src/multimediawidgets/qpaintervideosurface_p.h
src/multimediawidgets/qtmultimediawidgetdefs.h
src/multimediawidgets/qvideowidget.h
src/multimediawidgets/qvideowidget_p.h
src/multimediawidgets/qvideowidgetcontrol.h
src/plugins/blackberry/mediaplayer/bbmediaplayercontrol.cpp
src/plugins/blackberry/mediaplayer/bbmetadata.cpp
src/plugins/blackberry/mediaplayer/bbmetadata.h
src/plugins/directshow/camera/dscameracontrol.h
src/plugins/directshow/camera/dscameraservice.cpp
src/plugins/directshow/camera/dscameraservice.h
src/plugins/directshow/camera/dscamerasession.cpp
src/plugins/directshow/camera/dscamerasession.h
src/plugins/directshow/camera/dsimagecapturecontrol.h
src/plugins/directshow/camera/dsvideodevicecontrol.h
src/plugins/directshow/camera/dsvideorenderer.h
src/plugins/directshow/camera/dsvideowidgetcontrol.cpp
src/plugins/directshow/camera/dsvideowidgetcontrol.h
src/plugins/directshow/dsserviceplugin.cpp
src/plugins/directshow/player/directshowiosource.cpp
src/plugins/directshow/player/directshowmediatypelist.cpp
src/plugins/directshow/player/directshowplayerservice.cpp
src/plugins/directshow/player/videosurfacefilter.cpp
tests/auto/unit/qmultimedia_common/mockaudiodecodercontrol.h
tests/auto/unit/qpaintervideosurface/tst_qpaintervideosurface.cpp