Yoann Lopes 9d2943bce8 Merge remote-tracking branch 'origin/5.4' into 5.5 ...

Conflicts:
	.qmake.conf
	src/plugins/avfoundation/camera/avfcamerasession.h
	src/plugins/avfoundation/camera/avfcamerasession.mm

Change-Id: Ib2e25d907a7069591920d2f69e007f314cc0fd85

2015-05-05 11:48:21 +02:00

..

qmlvideofx

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

2015-05-05 11:48:21 +02:00