[Merge] lp:~uriboni/qtubuntu-camera/performance-improvements into lp:qtubuntu-camera/staging

[Florian Boucault]

Attempt to merge into lp:qtubuntu-camera/staging failed due to conflicts: 

text conflict in src/aalimagecapturecontrol.cpp
text conflict in src/aalimagecapturecontrol.h
deleting parent in unittests/aalimagecapturecontrol
unversioned parent in unittests/aalimagecapturecontrol
contents conflict in unittests/aalimagecapturecontrol/aalvideorenderercontrol.cpp
-- 
https://code.launchpad.net/~uriboni/qtubuntu-camera/performance-improvements/+merge/285075
Your team Ubuntu Phablet Team is requested to review the proposed merge of lp:~uriboni/qtubuntu-camera/performance-improvements into lp:qtubuntu-camera/staging.