Merge lp:~phablet-team/camera-app/flash_fixes into lp:camera-app/staging

[Florian Boucault]

Removed faulty workaround for flash. Was breaking video torch when focusing.
Proper fix added to qtubuntu-camera.

[Ugo Riboni (uriboni)]

LGTM and tested ok

review: Approve

=== modified file 'CameraApp/advancedcamerasettings.cpp'
--- CameraApp/advancedcamerasettings.cpp	2015-11-25 13:54:58 +0000
+++ CameraApp/advancedcamerasettings.cpp	2015-12-02 08:40:20 +0000
@@ -338,7 +338,7 @@
 {
     float screenAspectRatio;
     QScreen *screen = QGuiApplication::primaryScreen();
-    Q_ASSERT(!screen);
+    Q_ASSERT(screen);
     const int kScreenWidth = screen->geometry().width();
     const int kScreenHeight = screen->geometry().height();
     Q_ASSERT(kScreenWidth > 0 && kScreenHeight > 0);

=== modified file 'ViewFinderOverlay.qml'
--- ViewFinderOverlay.qml	2015-11-25 17:47:00 +0000
+++ ViewFinderOverlay.qml	2015-12-02 08:40:20 +0000
@@ -256,18 +256,6 @@
         }
     }
 
-    Connections {
-        target: camera.imageCapture
-        onReadyChanged: {
-            if (camera.imageCapture.ready) {
-                // FIXME: this is a workaround: simply setting
-                // camera.flash.mode to the settings value does not have any effect
-                camera.flash.mode = Camera.FlashOff;
-                camera.flash.mode = settings.flashMode;
-            }
-        }
-    }
-
     function optionsOverlayClose() {
         print("optionsOverlayClose")
         if (optionsOverlayLoader.item.valueSelectorOpened) {