Merge lp:~uriboni/camera-app/query-manual-focus-supported into lp:camera-app/staging

[Ugo Riboni]

Query the manual focus support to enable/disable tap-to-focus as the backend supports it

Query the manual focus support to enable/disable tap-to-focus as the backend supports it

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:637
http://jenkins.qa.ubuntu.com/job/camera-app-staging-ci/15/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-staging-vivid-amd64-ci/15
        deb: http://jenkins.qa.ubuntu.com/job/camera-app-staging-vivid-amd64-ci/15/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-staging-vivid-armhf-ci/15
        deb: http://jenkins.qa.ubuntu.com/job/camera-app-staging-vivid-armhf-ci/15/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-staging-vivid-i386-ci/15
        deb: http://jenkins.qa.ubuntu.com/job/camera-app-staging-vivid-i386-ci/15/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-vivid-touch/375
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-runner-touch/1046
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-vivid-armhf/924
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/26819

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/camera-app-staging-ci/15/rebuild

review: Needs Fixing (continuous-integration)

[Florian Boucault (fboucault)]

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

text conflict in ViewFinderOverlay.qml

[lp:~uriboni/camera-app/query-manual-focus-supported]

638. By Ugo Riboni on 2016-01-21

Merge changes from trunk

=== modified file 'ViewFinderOverlay.qml'
--- ViewFinderOverlay.qml	2016-01-20 12:36:02 +0000
+++ ViewFinderOverlay.qml	2016-01-21 17:12:46 +0000
@@ -885,15 +885,12 @@
                     leftMargin: -bottomEdgeIndicators.height
                     rightMargin: -bottomEdgeIndicators.height
                 }
-
-                enabled: !camera.photoCaptureInProgress
+                enabled: camera.focus.isFocusPointModeSupported(Camera.FocusPointCustom) &&
+                         !camera.photoCaptureInProgress
                 onClicked: {
                     camera.manualFocus(mouse.x, mouse.y);
                     mouse.accepted = false;
                 }
-                // FIXME: calling 'isFocusPointModeSupported' fails with
-                // "Error: Unknown method parameter type: QDeclarativeCamera::FocusPointMode"
-                //enabled: camera.focus.isFocusPointModeSupported(Camera.FocusPointCustom)
             }
         }