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

[Florian Boucault]

Photo roll's slideshow view: use the photo downscaled instead of the thumbnailer.

[lp:~fboucault/camera-app/slideshow_use_photo_not_thumbnail]

403. By Florian Boucault on 2014-10-03

Empty commit

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:403
http://jenkins.qa.ubuntu.com/job/camera-app-ci/294/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-utopic-amd64-ci/110
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-utopic-armhf-ci/110
        deb: http://jenkins.qa.ubuntu.com/job/camera-app-utopic-armhf-ci/110/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-utopic-i386-ci/110
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-utopic-touch/463
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/3918
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-runner-mako/606
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-utopic-armhf/749
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/14126
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/3293
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/4235
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/4235/artifact/work/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

[Ugo Riboni (uriboni)]

LGTM and does what it says

=== modified file 'SlideshowView.qml'
--- SlideshowView.qml	2014-09-30 22:41:12 +0000
+++ SlideshowView.qml	2014-10-03 15:43:43 +0000
@@ -179,7 +179,7 @@
                             anchors.fill: parent
                             asynchronous: true
                             cache: false
-                            source: slideshowView.inView ? "image://thumbnailer/" + fileURL.toString() : ""
+                            source: slideshowView.inView ? (media.isVideo ? "image://thumbnailer/" + fileURL.toString() : fileURL) : ""
                             sourceSize {
                                 width: listView.maxDimension
                                 height: listView.maxDimension