Merge remote-tracking branch 'origin/5.3' into dev
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Thu, 10 Jul 2014 08:14:36 +0000 (10:14 +0200)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>
Thu, 10 Jul 2014 08:14:36 +0000 (10:14 +0200)
Change-Id: I38ebcb3da0e4d2acc9e7108c9579ea98323864e0

1  2 
src/imports/multimedia/qdeclarativecamera.cpp