Sergio Ahumada d691f5ca2b Merge remote-tracking branch 'origin/5.3' into dev ...

Conflicts:
	.qmake.conf

Change-Id: Iecd8d7b94e52a8981526b12cffa40e99870ba62f

2014-06-14 21:59:24 +02:00

..

camera

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

2014-06-14 21:59:24 +02:00

customvideosurface

make use of qtHaveModule()

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

player

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

2014-06-14 21:59:24 +02:00

videographicsitem

Doc: Improved example documentation

2014-04-14 06:45:43 +02:00

videowidget

Doc: Improved example documentation

2014-04-14 06:45:43 +02:00

multimediawidgets.pro

Moved declarative-camera example in the right directory.

2013-07-24 13:09:44 +02:00