Yoann Lopes a2244c9b7a Merge remote-tracking branch 'origin/5.5' into 5.6 ...

Conflicts:
	src/imports/multimedia/qdeclarativeaudio.cpp

Change-Id: I57c6252b084e4ed796f6f308b2e0c717d0f59b13

2015-08-24 14:36:13 +02:00

..

mock.pri

New camera selection API in QML.

2014-07-17 18:58:00 +02:00

mockaudiodecodercontrol.h

Update copyright headers

2015-02-12 10:27:47 +00:00

mockaudiodecoderservice.h

Update copyright headers

2015-02-12 10:27:47 +00:00

mockaudioencodercontrol.h

Update copyright headers

2015-02-12 10:27:47 +00:00

mockaudioinputselector.h

Update copyright headers

2015-02-12 10:27:47 +00:00

mockaudioprobecontrol.h

Update copyright headers

2015-02-12 10:27:47 +00:00

mockaudiorolecontrol.h

Add audio role API to QMediaPlayer.

2015-08-10 15:12:22 +00:00

mockavailabilitycontrol.h

Update copyright headers

2015-02-12 10:27:47 +00:00

mockcamera.pri

New camera viewfinder settings API.

2015-01-13 13:34:41 +01:00

mockcameracapturebuffercontrol.h

Update copyright headers

2015-02-12 10:27:47 +00:00

mockcameracapturedestinationcontrol.h

Update copyright headers

2015-02-12 10:27:47 +00:00

mockcameracontrol.h

Update copyright headers

2015-02-12 10:27:47 +00:00

mockcameraexposurecontrol.h

Update copyright headers

2015-02-12 10:27:47 +00:00

mockcameraflashcontrol.h

Update copyright headers

2015-02-12 10:27:47 +00:00

mockcamerafocuscontrol.h

Update copyright headers

2015-02-12 10:27:47 +00:00

mockcameraimagecapturecontrol.h

Update copyright headers

2015-02-12 10:27:47 +00:00

mockcameraimageprocessingcontrol.h

Update copyright headers

2015-02-12 10:27:47 +00:00

mockcamerainfocontrol.h

Update copyright headers

2015-02-12 10:27:47 +00:00

mockcameralockscontrol.h

Update copyright headers

2015-02-12 10:27:47 +00:00

mockcameraservice.h

Update copyright headers

2015-02-12 10:27:47 +00:00

mockcameraviewfindersettingscontrol.h

Fix QCamera viewfinder capabilities functions..

2015-08-18 12:58:00 +00:00

mockcamerazoomcontrol.h

Update copyright headers

2015-02-12 10:27:47 +00: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 headers

2015-02-12 10:27:47 +00:00

mockmediacontainercontrol.h

Update copyright headers

2015-02-12 10:27:47 +00:00

mockmedianetworkaccesscontrol.h

Update copyright headers

2015-02-12 10:27:47 +00:00

mockmediaobject.h

Update copyright headers

2015-02-12 10:27:47 +00:00

mockmediaplayercontrol.h

QMediaPlayer: handle resource files in a cross-platform way.

2015-04-07 17:21:47 +00:00

mockmediaplayerservice.h

Add audio role API to QMediaPlayer.

2015-08-10 15:12:22 +00:00

mockmediaplaylistcontrol.h

Update copyright headers

2015-02-12 10:27:47 +00:00

mockmediaplaylistsourcecontrol.h

Update copyright headers

2015-02-12 10:27:47 +00:00

mockmediarecordercontrol.h

Update copyright headers

2015-02-12 10:27:47 +00:00

mockmediarecorderservice.h

Update copyright headers

2015-02-12 10:27:47 +00:00

mockmediaservice.h

Update copyright headers

2015-02-12 10:27:47 +00:00

mockmediaserviceprovider.h

QMediaPlayer: handle resource files in a cross-platform way.

2015-04-07 17:21:47 +00:00

mockmediastreamscontrol.h

Update copyright headers

2015-02-12 10:27:47 +00:00

mockmetadatareadercontrol.h

Update copyright headers

2015-02-12 10:27:47 +00:00

mockmetadatawritercontrol.h

Update copyright headers

2015-02-12 10:27:47 +00:00

mockplayer.pri

Add audio role API to QMediaPlayer.

2015-08-10 15:12:22 +00:00

mockplaylist.pri

Rearrange the automatic tests.

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

mockplaylistservice.h

Update copyright headers

2015-02-12 10:27:47 +00:00

mockradio.pri

Rearrange the automatic tests.

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

mockradiodatacontrol.h

Update copyright headers

2015-02-12 10:27:47 +00:00

mockradiotunercontrol.h

Update copyright headers

2015-02-12 10:27:47 +00:00

mockreadonlyplaylistprovider.h

Update copyright headers

2015-02-12 10:27:47 +00: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

mockvideodeviceselectorcontrol.h

Update copyright headers

2015-02-12 10:27:47 +00:00

mockvideoencodercontrol.h

Update copyright headers

2015-02-12 10:27:47 +00:00

mockvideoprobecontrol.h

Update copyright headers

2015-02-12 10:27:47 +00:00

mockvideorenderercontrol.h

Update copyright headers

2015-02-12 10:27:47 +00:00

mockvideosurface.h

Update copyright headers

2015-02-12 10:27:47 +00:00

mockvideowindowcontrol.h

Update copyright headers

2015-02-12 10:27:47 +00:00