Frederik Gladhorn 47698fc57f Merge remote-tracking branch 'origin/5.4' into dev ...

Conflicts:
	.qmake.conf

Change-Id: I31e377cdccf8bf5c1ea8143faf2001ac99608c27

2014-12-17 16:53:41 +01:00

..

gsttools

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

2014-12-17 16:53:41 +01:00

imports

Disable warning about QObject::event being hidden

2014-12-03 22:29:20 +01:00

multimedia

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

2014-12-17 16:53:41 +01:00

multimediawidgets

Make it compile with no-opengl

2014-12-11 16:22:34 +01:00

plugins

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

2014-12-17 16:53:41 +01:00

qtmultimediaquicktools

Fix VideoOutput autoOrientation when switching cameras.

2014-12-03 14:27:35 +01:00

src.pro

make use of qtHaveModule()

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