Frederik Gladhorn 422099e8dd Merge remote-tracking branch 'origin/stable' into dev ...

Conflicts:
	.qmake.conf

Change-Id: Id367a610a3aefd288bfe287a3bf64606e582deb9

2014-01-17 17:20:59 +01:00

..

qabstractvideobuffer

Update copyright year in Digia's license headers

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

qabstractvideosurface

Update copyright year in Digia's license headers

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

qaudiobuffer

Update copyright year in Digia's license headers

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

qaudiodecoder

Update copyright year in Digia's license headers

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

qaudioformat

Update copyright year in Digia's license headers

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

qaudionamespace

Update copyright year in Digia's license headers

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

qaudioprobe

Update copyright year in Digia's license headers

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

qaudiorecorder

Update copyright year in Digia's license headers

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

qcamera

Update copyright year in Digia's license headers

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

qcameraimagecapture

Update copyright year in Digia's license headers

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

qcameraviewfinder

Update copyright year in Digia's license headers

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

qcamerawidgets

Update copyright year in Digia's license headers

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

qdeclarativeaudio

Decouple qmediametadata.h from qmultimedia.h

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

qdeclarativevideo

Update copyright year in Digia's license headers

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

qgraphicsvideoitem

Update copyright year in Digia's license headers

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

qmediabindableinterface

Update copyright year in Digia's license headers

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

qmediacontainercontrol

Update copyright year in Digia's license headers

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

qmediacontent

Update copyright year in Digia's license headers

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

qmediaobject

Decouple qmediametadata.h from qmultimedia.h

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

qmediaplayer

Update copyright year in Digia's license headers

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

qmediaplayerwidgets

Update copyright year in Digia's license headers

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

qmediaplaylist

Remove unnecessary warning in QMediaPlaylistNavigator.

2013-10-09 12:17:52 +02:00

qmediaplaylistnavigator

Remove unnecessary warning in QMediaPlaylistNavigator.

2013-10-09 12:17:52 +02:00

qmediapluginloader

Update copyright year in Digia's license headers

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

qmediarecorder

Decouple qmediametadata.h from qmultimedia.h

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

qmediaresource

Update copyright year in Digia's license headers

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

qmediaservice

Update copyright year in Digia's license headers

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

qmediaserviceprovider

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

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

qmediatimerange

Update copyright year in Digia's license headers

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

qmetadatareadercontrol

Decouple qmediametadata.h from qmultimedia.h

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

qmetadatawritercontrol

Decouple qmediametadata.h from qmultimedia.h

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

qmultimedia_common

Decouple qmediametadata.h from qmultimedia.h

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

qpaintervideosurface

Stabilized QPainterVideoSurface auto-test.

2013-09-17 18:55:50 +02:00

qradiodata

Update copyright year in Digia's license headers

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

qradiotuner

Update copyright year in Digia's license headers

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

qsamplecache

Update copyright year in Digia's license headers

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

qvideoencodersettingscontrol

Update copyright year in Digia's license headers

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

qvideoframe

Fix whitespace issue in the QVideoFrame auto test.

2014-01-07 12:38:45 +01:00

qvideoprobe

Update copyright year in Digia's license headers

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

qvideosurfaceformat

Update copyright year in Digia's license headers

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

qvideowidget

Update copyright year in Digia's license headers

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

qwavedecoder

Fix calculation bug in QWaveDecoder.

2013-03-22 17:50:22 +01:00

multimedia.pro

Fix build without Qml and Quick modules.

2014-01-16 15:56:19 +01:00

multimediaqml.pro

Fix build without Qml and Quick modules.

2014-01-16 15:56:19 +01:00

multimediawidgets.pro

Remove QMediaImageViewer (SC break).

2012-02-03 03:21:43 +01:00

unit.pro

Fix build without Qml and Quick modules.

2014-01-16 15:56:19 +01:00