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)
commit074bd6ab37bbbb4dbba188921783fd98be872555
tree318284e5ce86569c6d0c9c37d143b6f63781eede
parent4ba4f1a51db14c1df20b27cc375255077f051819
parent8da61153c9b4e505b6f8a0e7a6c630690516d845
Merge remote-tracking branch 'origin/5.3' into dev

Change-Id: I38ebcb3da0e4d2acc9e7108c9579ea98323864e0
src/imports/multimedia/qdeclarativecamera.cpp