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

..

alsa

Merge remote-tracking branch 'origin/5.4' into 5.5

2015-03-17 09:48:51 +01:00

android

Merge remote-tracking branch 'origin/5.5' into 5.6

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

audiocapture

Update copyright headers

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

avfoundation

Fix warnings about unused private fields

2015-08-06 16:00:03 +00:00

coreaudio

Merge remote-tracking branch 'origin/5.4' into 5.5

2015-04-15 09:26:14 +02:00

directshow

Fix QCamera viewfinder capabilities functions..

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

gstreamer

Merge remote-tracking branch 'origin/5.5' into 5.6

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

m3u

Update copyright headers

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

opensles

Update copyright headers

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

pulseaudio

pulseaudio: Remove unused static member variable

2015-06-01 16:36:20 +00:00

qnx

Merge remote-tracking branch 'origin/5.4' into 5.5

2015-04-15 09:26:14 +02:00

qnx-audio

Update copyright headers

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

resourcepolicy

Update copyright headers

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

v4l

Update copyright headers

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

videonode

videonode: imx6: Ensure the video node excludes padding pixels

2015-05-26 11:57:56 +00:00

windowsaudio

WindowsAudio: Fix compiler warnings by g++/MinGW.

2015-07-13 13:42:41 +00:00

winrt

Make QWinRTImageEncoderControl a Q_OBJECT.

2015-08-19 07:12:11 +00:00

wmf

WMF: fix start time of buffers provided by QAudioDecoder.

2015-05-19 11:41:42 +00:00

plugins.pro

Check for the quick module before adding the videonode plugin

2015-02-27 12:37:14 +00:00