Merge lp:~fboucault/camera-app/swipe_no_zoom into lp:camera-app

[Florian Boucault]

Swiping quickly through photo roll no longer causes photos to zoom. Workaround for QTBUG-39332.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:496
http://jenkins.qa.ubuntu.com/job/camera-app-ci/378/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-amd64-ci/74/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-armhf-ci/74/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-i386-ci/74/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-vivid-touch/125
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-vivid/572/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-runner-mako/762
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-vivid-armhf/277
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/17859
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/682/console

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

review: Needs Fixing (continuous-integration)

[Bill Filler (bfiller)]

approved

review: Approve

=== modified file 'SlideshowView.qml'
--- SlideshowView.qml	2015-01-28 11:42:09 +0000
+++ SlideshowView.qml	2015-02-06 21:01:56 +0000
@@ -239,6 +239,15 @@
                             mouse.accepted = false;
                         }
                         onDoubleClicked: {
+                            if (listView.moving) {
+                                // FIXME: workaround for Qt bug specific to touch:
+                                // doubleClicked is received even though the MouseArea
+                                // was tapped only once but another MouseArea was also
+                                // tapped shortly before.
+                                // Ref.: https://bugreports.qt.io/browse/QTBUG-39332
+                                return;
+                            }
+
                             if (media.isVideo) {
                                 return;
                             }