Frederik Gladhorn 00c072bf0e Merge remote-tracking branch 'origin/stable' into dev ...

Conflicts:
	tests/auto/unit/qaudioformat/tst_qaudioformat.cpp

Change-Id: I8499473569df9eac8c7069160e42ed477dacad4d

2014-04-11 14:22:22 +02: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

Fix MSVC-warning about truncation of constant in tst_qaudiobuffer.cpp.

2014-01-29 10:18:42 +01:00

qaudiodecoder

Update copyright year in Digia's license headers

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

qaudioformat

Add support for running on big-endian systems

2014-04-03 15:37:33 +02: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

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

2014-03-11 09:26:50 +01:00

qcameraimagecapture

Update copyright year in Digia's license headers

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

qcamerainfo

tst_qcamerainfo: Fix weird symbol in license header

2014-03-06 07:54:31 +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

Fix some MediaPlayer properties returning wrong values.

2014-04-09 14:48:49 +02:00

qdeclarativevideo

Update copyright year in Digia's license headers

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

qgraphicsvideoitem

whitespace fixes

2014-01-30 14:32:10 +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

Prefer to use normalised signal/slot signatures

2014-03-03 12:12:31 +01:00

qmediaplayer

Fix autotests expecting a trailing whitespace for qDebug stream

2014-02-20 11:12:54 +01:00

qmediaplayerwidgets

Update copyright year in Digia's license headers

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

qmediaplaylist

whitespace fixes

2014-01-30 14:32:10 +01:00

qmediaplaylistnavigator

Fix unit tests

2014-04-02 18:20:55 +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

New QCameraInfo class.

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

qmediatimerange

whitespace fixes

2014-01-30 14:32:10 +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

New QCameraInfo class.

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

qpaintervideosurface

whitespace fixes

2014-01-30 14:32:10 +01:00

qradiodata

Update copyright year in Digia's license headers

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

qradiotuner

whitespace fixes

2014-01-30 14:32:10 +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

Removed debug operator autotests.

2014-03-26 16:35:41 +01:00

qvideoprobe

Update copyright year in Digia's license headers

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

qvideosurfaceformat

Removed debug operator autotests.

2014-03-26 16:35:41 +01:00

qvideowidget

Fix unit tests

2014-04-02 18:20:55 +02:00

qwavedecoder

Fix calculation bug in QWaveDecoder.

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

multimedia.pro

New QCameraInfo class.

2014-02-28 14:10:00 +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