[Merge] lp:~ycheng-twn/qtubuntu-camera/qtubuntu-camera_lp1365385 into lp:qtubuntu-camera

[Jim Hodapp]

Review: Needs Fixing

There's a failing unit test. Please make sure your code allows the failing test to pass and then push to this MR again: https://launchpadlibrarian.net/185121554/buildlog_ubuntu-rtm-14.09-armhf.qtubuntu-camera_0.3.3%2B14.10.20140917-0ubuntu1_FAILEDTOBUILD.txt.gz
-- 
https://code.launchpad.net/~ycheng-twn/qtubuntu-camera/qtubuntu-camera_lp1365385/+merge/233320
Your team Ubuntu Phablet Team is subscribed to branch lp:qtubuntu-camera.