Frederik Gladhorn 422099e8dd Merge remote-tracking branch 'origin/stable' into dev ...

Conflicts:
	.qmake.conf

Change-Id: Id367a610a3aefd288bfe287a3bf64606e582deb9

2014-01-17 17:20:59 +01:00

..

gsttools

Allow the camerabin source selection to be overridden.

2014-01-13 06:05:05 +01:00

imports

Fix recording settings being discarded by the Camera QML type.

2014-01-13 06:05:52 +01:00

multimedia

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

2014-01-17 17:20:59 +01:00

multimediawidgets

Doc: Updated url variable in qdocconf files.

2013-11-06 10:56:03 +01:00

plugins

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

2014-01-17 17:20:59 +01:00

qtmultimediaquicktools

Update copyright year in Digia's license headers

2013-01-10 17:56:01 +01:00

src.pro

make use of qtHaveModule()

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