Sergio Ahumada d691f5ca2b Merge remote-tracking branch 'origin/5.3' into dev ...

Conflicts:
	.qmake.conf

Change-Id: Iecd8d7b94e52a8981526b12cffa40e99870ba62f

2014-06-14 21:59:24 +02:00

..

audio

Improve default audio plugin selection.

2014-06-05 11:42:16 +02:00

camera

Use Q_CONSTRUCTOR_FUNCTION macro to register multimedia meta types.

2014-05-30 14:47:54 +02:00

controls

Use Q_CONSTRUCTOR_FUNCTION macro to register multimedia meta types.

2014-05-30 14:47:54 +02:00

doc

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

2014-06-14 21:59:24 +02:00

gsttools_headers

GStreamer: fix memory leaks.

2014-03-21 19:16:09 +01:00

playback

Use Q_CONSTRUCTOR_FUNCTION macro to register multimedia meta types.

2014-05-30 14:47:54 +02:00

qtmultimediaquicktools_headers

VideoOutput: fix autoOrientation with a camera source.

2014-02-28 14:10:14 +01:00

radio

Use Q_CONSTRUCTOR_FUNCTION macro to register multimedia meta types.

2014-05-30 14:47:54 +02:00

recording

Use Q_CONSTRUCTOR_FUNCTION macro to register multimedia meta types.

2014-05-30 14:47:54 +02:00

video

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

2014-06-14 21:59:24 +02:00

multimedia.pro

Moved QMediaStorageLocation out of the Android plugin.

2014-05-09 16:33:12 +02:00

qmediabindableinterface.cpp

Update copyright year in Digia's license headers

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

qmediabindableinterface.h

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

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

qmediacontrol_p.h

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

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

qmediacontrol.cpp

Update copyright year in Digia's license headers

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

qmediacontrol.h

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

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

qmediaenumdebug.h

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

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

qmediametadata.cpp

Update copyright year in Digia's license headers

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

qmediametadata.h

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

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

qmediaobject_p.h

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

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

qmediaobject.cpp

Update copyright year in Digia's license headers

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

qmediaobject.h

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

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

qmediapluginloader_p.h

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

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

qmediapluginloader.cpp

Multimedia plugins now have a unique JSON metadata 'Keys' property.

2013-06-21 12:07:00 +02:00

qmediaresourcepolicy_p.cpp

Update copyright year in Digia's license headers

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

qmediaresourcepolicy_p.h

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

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

qmediaresourcepolicyplugin_p.cpp

Update copyright year in Digia's license headers

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

qmediaresourcepolicyplugin_p.h

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

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

qmediaresourceset_p.cpp

Update copyright year in Digia's license headers

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

qmediaresourceset_p.h

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

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

qmediaservice_p.h

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

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

qmediaservice.cpp

Doc: Fixed random QDoc warnings

2013-01-17 16:03:48 +01:00

qmediaservice.h

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

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

qmediaserviceprovider_p.h

New QCameraInfo class.

2014-02-28 14:10:00 +01:00

qmediaserviceprovider.cpp

New QCameraInfo class.

2014-02-28 14:10:00 +01:00

qmediaserviceproviderplugin.h

Add missing virtual destructor for new class

2014-03-01 14:10:01 +01:00

qmediastoragelocation_p.h

Moved QMediaStorageLocation out of the Android plugin.

2014-05-09 16:33:12 +02:00

qmediastoragelocation.cpp

Moved QMediaStorageLocation out of the Android plugin.

2014-05-09 16:33:12 +02:00

qmediatimerange.cpp

Doc: Fixed random QDoc warnings

2013-01-17 16:03:48 +01:00

qmediatimerange.h

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

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

qmultimedia.cpp

Use Q_CONSTRUCTOR_FUNCTION macro to register multimedia meta types.

2014-05-30 14:47:54 +02:00

qmultimedia.h

Decouple qmediametadata.h from qmultimedia.h

2013-05-14 11:27:05 +02:00

qtmultimediadefs.h

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

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