Liang Qi 112595bf80 Merge remote-tracking branch 'origin/5.5' into dev ...

Conflicts:
	.qmake.conf

Change-Id: Ib38fe1e0a4c937068741a9556748a18e35ba59af

2015-06-29 20:10:15 +02:00

..

gsttools

GStreamer: remove unnecessary qWarning().

2015-06-02 22:29:55 +00:00

imports

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

2015-06-29 20:10:15 +02:00

multimedia

QCameraViewFinderSettings: add missing include

2015-06-14 08:43:46 +00:00

multimediawidgets

Support BGR format for OpenGL textures in QPainterVideoSurface.

2015-06-10 11:37:30 +00:00

plugins

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

2015-06-29 20:10:15 +02:00

qtmultimediaquicktools

Add an env var to disable OpenGL texture-based video frames.

2015-06-03 12:47:44 +00:00

src.pro

make use of qtHaveModule()

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