Frederik Gladhorn d396262bc9 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

2013-02-19 17:15:56 +01:00

..

mock.pri

Expose availability from the backend to C++ and QML.

2012-03-02 09:30:34 +01:00

mockaudiodecodercontrol.h

Merge remote-tracking branch 'origin/stable' into dev

2013-02-19 17:15:56 +01:00

mockaudiodecoderservice.h

Update copyright year in Digia's license headers

2013-01-10 17:56:01 +01:00

mockaudioencodercontrol.h

Update copyright year in Digia's license headers

2013-01-10 17:56:01 +01:00

mockaudioinputselector.h

Update copyright year in Digia's license headers

2013-01-10 17:56:01 +01:00

mockaudioprobecontrol.h

Update copyright year in Digia's license headers

2013-01-10 17:56:01 +01:00

mockavailabilitycontrol.h

Update copyright year in Digia's license headers

2013-01-10 17:56:01 +01:00

mockcamera.pri

Moved zoom related properties out of QCameraFocusControl

2012-01-27 08:26:47 +01:00

mockcameracapturebuffercontrol.h

Update copyright year in Digia's license headers

2013-01-10 17:56:01 +01:00

mockcameracapturedestinationcontrol.h

Update copyright year in Digia's license headers

2013-01-10 17:56:01 +01:00

mockcameracontrol.h

Update copyright year in Digia's license headers

2013-01-10 17:56:01 +01:00

mockcameraexposurecontrol.h

Update copyright year in Digia's license headers

2013-01-10 17:56:01 +01:00

mockcameraflashcontrol.h

Update copyright year in Digia's license headers

2013-01-10 17:56:01 +01:00

mockcamerafocuscontrol.h

Update copyright year in Digia's license headers

2013-01-10 17:56:01 +01:00

mockcameraimagecapturecontrol.h

Update copyright year in Digia's license headers

2013-01-10 17:56:01 +01:00

mockcameraimageprocessingcontrol.h

Update copyright year in Digia's license headers

2013-01-10 17:56:01 +01:00

mockcameralockscontrol.h

Update copyright year in Digia's license headers

2013-01-10 17:56:01 +01:00

mockcameraservice.h

Update copyright year in Digia's license headers

2013-01-10 17:56:01 +01:00

mockcamerazoomcontrol.h

Update copyright year in Digia's license headers

2013-01-10 17:56:01 +01:00

mockcontainer.pri

Rearrange the automatic tests.

2011-11-04 08:19:17 +01:00

mockdecoder.pri

Add the audio decoder variant of QMediaPlayer.

2012-02-08 11:36:08 +01:00

mockimageencodercontrol.h

Update copyright year in Digia's license headers

2013-01-10 17:56:01 +01:00

mockmediacontainercontrol.h

Update copyright year in Digia's license headers

2013-01-10 17:56:01 +01:00

mockmedianetworkaccesscontrol.h

Update copyright year in Digia's license headers

2013-01-10 17:56:01 +01:00

mockmediaobject.h

Update copyright year in Digia's license headers

2013-01-10 17:56:01 +01:00

mockmediaplayercontrol.h

Update copyright year in Digia's license headers

2013-01-10 17:56:01 +01:00

mockmediaplayerservice.h

Update copyright year in Digia's license headers

2013-01-10 17:56:01 +01:00

mockmediaplaylistcontrol.h

Update copyright year in Digia's license headers

2013-01-10 17:56:01 +01:00

mockmediaplaylistsourcecontrol.h

Update copyright year in Digia's license headers

2013-01-10 17:56:01 +01:00

mockmediarecordercontrol.h

Update copyright year in Digia's license headers

2013-01-10 17:56:01 +01:00

mockmediarecorderservice.h

Update copyright year in Digia's license headers

2013-01-10 17:56:01 +01:00

mockmediaservice.h

Update copyright year in Digia's license headers

2013-01-10 17:56:01 +01:00

mockmediaserviceprovider.h

Update copyright year in Digia's license headers

2013-01-10 17:56:01 +01:00

mockmediastreamscontrol.h

Update copyright year in Digia's license headers

2013-01-10 17:56:01 +01:00

mockmetadatareadercontrol.h

Update copyright year in Digia's license headers

2013-01-10 17:56:01 +01:00

mockmetadatawritercontrol.h

Update copyright year in Digia's license headers

2013-01-10 17:56:01 +01:00

mockplayer.pri

QVideoProbe unit test.

2012-04-20 08:47:19 +02:00

mockplaylist.pri

Rearrange the automatic tests.

2011-11-04 08:19:17 +01:00

mockplaylistservice.h

Update copyright year in Digia's license headers

2013-01-10 17:56:01 +01:00

mockradio.pri

Rearrange the automatic tests.

2011-11-04 08:19:17 +01:00

mockradiodatacontrol.h

Update copyright year in Digia's license headers

2013-01-10 17:56:01 +01:00

mockradiotunercontrol.h

Update copyright year in Digia's license headers

2013-01-10 17:56:01 +01:00

mockreadonlyplaylistprovider.h

Update copyright year in Digia's license headers

2013-01-10 17:56:01 +01:00

mockrecorder.pri

Replaced endpoint control with audio input and output controls

2012-07-24 09:49:47 +02:00

mockvideo.pri

Move QVideoWindowControl out of widgets.

2012-04-25 04:02:15 +02:00

mockvideoencodercontrol.h

Update copyright year in Digia's license headers

2013-01-10 17:56:01 +01:00

mockvideoprobecontrol.h

Update copyright year in Digia's license headers

2013-01-10 17:56:01 +01:00

mockvideorenderercontrol.h

Update copyright year in Digia's license headers

2013-01-10 17:56:01 +01:00

mockvideosurface.h

Update copyright year in Digia's license headers

2013-01-10 17:56:01 +01:00

mockvideowindowcontrol.h

Update copyright year in Digia's license headers

2013-01-10 17:56:01 +01:00