Merge lp:~artmello/camera-app/camera-app-mirror_desktop into lp:camera-app

[Arthur Mello]

Flip the video horizontally if we are on desktop

Flip the video horizontally if we are on desktop

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:265
http://jenkins.qa.ubuntu.com/job/camera-app-ci/189/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-utopic-amd64-ci/5
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-utopic-armhf-ci/5
        deb: http://jenkins.qa.ubuntu.com/job/camera-app-utopic-armhf-ci/5/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-utopic-i386-ci/5
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-utopic-touch/10
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/66
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-runner-mako/148
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-utopic-armhf/11
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/6903
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/62
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/93
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/93/artifact/work/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

[Arthur Mello (artmello)]

Are there any related MPs required for this MP to build/function as expected? Please list: No
Is your branch in sync with latest trunk (e.g. bzr pull lp:trunk -> no changes): Yes
Did you perform an exploratory manual test run of your code change and any related functionality on device or emulator?: Yes
Did you successfully run all tests found in your component's Test Plan (https://wiki.ubuntu.com/Process/Merges/TestPlan/camera-app) on device or emulator? Yes
If you changed the UI, was the change specified/approved by design? No UI changes.
If you changed the packaging (debian), did you subscribe a core-dev to this MP? No packaging changes.

[Bill Filler (bfiller)]

Did you perform an exploratory manual test run of the code change and any related functionality on device or emulator?
yes

Did you successfully run all tests found in your component's Test Plan (https://wiki.ubuntu.com/Process/Merges/TestPlan/<package-name>) on device or emulator?
yes

Did CI run pass? If not, please explain why.
yes

Have you checked that submitter has accurately filled out the submitter checklist and has taken no shortcut?
yes

review: Approve

=== modified file 'camera-app.qml'
--- camera-app.qml	2014-02-10 10:01:22 +0000
+++ camera-app.qml	2014-05-07 18:45:47 +0000
@@ -155,6 +155,14 @@
            - the resolution and aspect ratio of the feed changes depending on the active camera
            The item is also separated in a component so it can be unit tested.
          */
+
+        transform: Rotation {
+            origin.x: viewFinder.width / 2
+            origin.y: viewFinder.height / 2
+            axis.x: 0; axis.y: 1; axis.z: 0
+            angle: application.desktopMode ? 180 : 0
+        }
+
         ViewFinderGeometry {
             id: viewFinderGeometry
             anchors.centerIn: parent