Frederik Gladhorn 0a05ae5446 Merge remote-tracking branch 'origin/stable' into dev ...

Change-Id: Ia2cf3c55e57d7ac17f02965915fa6933ff2c8cce

2013-07-11 23:26:39 +02:00

..

audio

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

2013-06-27 13:00:02 +02:00

camera

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

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

controls

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

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

doc

Doc: Setting navigation variables for Multimedia and Multimedia Widgets

2013-06-26 11:34:57 +02:00

gsttools_headers

Reset VideoSurface pointer when deleted

2013-04-23 11:17:34 +02:00

playback

Fix typo in QMediaPlayer docs.

2013-05-31 15:22:20 +02:00

qtmultimediaquicktools_headers

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

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

radio

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

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

recording

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

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

video

Add autoOrientation property to QDeclarativeVideoOutput

2013-03-19 13:33:43 +01:00

multimedia.pro

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

2013-07-11 23:26:39 +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

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

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

qmediaserviceprovider.cpp

Merge branch 'release' into stable

2013-01-29 15:21:05 +01:00

qmediaserviceproviderplugin.h

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

2013-02-19 17:15:56 +01: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

Update copyright year in Digia's license headers

2013-01-10 17:56:01 +01: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