Sergio Ahumada 41a1c16340 Merge remote-tracking branch 'origin/5.3' into 5.4 ...

Conflicts:
	.qmake.conf

Change-Id: Iad73368a22c6d4662188e6f357a265d0c26756d0

2014-09-26 15:28:44 +02:00

..

gsttools

Ensure pre-roll frames are displayed when gstreamer backend is paused.

2014-09-12 14:32:42 +02:00

imports

Make the multimedia examples less verbose

2014-09-22 11:11:10 +02:00

multimedia

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

2014-09-26 15:28:44 +02:00

multimediawidgets

Update license headers and add new license files

2014-08-24 17:30:13 +02:00

plugins

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

2014-09-26 15:28:44 +02:00

qtmultimediaquicktools

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

2014-09-01 12:52:51 +02:00

src.pro

make use of qtHaveModule()

2013-01-11 15:15:05 +01:00