Merge lp:~pete-woods/camera-app/handle-quit-signal into lp:camera-app

[Pete Woods]

Handle the HUD quit signal

This change is only necessary for apps that don't use the UITK MainView

> Are there any related MPs required for this MP to build/function as expected?
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?
Obvs

> 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

> If you changed the UI, was the change specified/approved by design?
No change

> If you changed the packaging (debian), did you subscribe a core-dev to this MP?
Subscribing.

Check List:
https://wiki.ubuntu.com/Process/Merges/Checklists/system-apps

Test Plan:
https://wiki.ubuntu.com/Process/Merges/TestPlan/camera-app

Silo:
<missing>

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:230
http://jenkins.qa.ubuntu.com/job/camera-app-ci/159/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-trusty-amd64-ci/17
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-trusty-armhf-ci/17
        deb: http://jenkins.qa.ubuntu.com/job/camera-app-trusty-armhf-ci/17/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-trusty-i386-ci/17
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/3061
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/2780/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/2689
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/3063
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/3063/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/2781
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/2781/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/5196/console
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/3793

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

review: Needs Fixing (continuous-integration)

[Antti Kaijanmäki (kaijanmaki)]

Checklist missing.

review: Needs Fixing

[Pete Woods (pete-woods)]

Adding seb128 to check my packaging changes.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:245
http://jenkins.qa.ubuntu.com/job/camera-app-ci/165/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-trusty-amd64-ci/23
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-trusty-armhf-ci/23
        deb: http://jenkins.qa.ubuntu.com/job/camera-app-trusty-armhf-ci/23/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-trusty-i386-ci/23
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/3242
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/2913
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/2850
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/3244
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/3244/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/2915
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/2915/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/5319
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/3959

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

review: Approve (continuous-integration)

[lp:~pete-woods/camera-app/handle-quit-signal]

244. By Bill Filler on 2014-02-13

initial support for DESKTOP_MODE

245. By PS Jenkins bot on 2014-02-13

Releasing 2.9.1+14.04.20140213-0ubuntu1

246. By Bill Filler on 2014-02-14

skip integration test until it's reworked to be more reliable

247. By PS Jenkins bot on 2014-02-14

Releasing 2.9.1+14.04.20140214-0ubuntu1

[Antti Kaijanmäki (kaijanmaki)]

waiting for a silo to be linked.

review: Abstain

[Antti Kaijanmäki (kaijanmaki)]

The code itself looks good to me.

[Antti Kaijanmäki (kaijanmaki)]

review: Abstain

[lp:~pete-woods/camera-app/handle-quit-signal]

248. By Launchpad Translations on behalf of phablet-team on 2014-02-21

Launchpad automatic translations update.

[Dimitri John Ledkov (xnox)]

claiming core-dev review. All is good.

review: Approve

[Pete Woods (pete-woods)]

Thanks, Dimitri :)

[Sebastien Bacher (seb128)]

(sorry, I somewhat didn't see the email about that one, just crossed it while looking at my +activereviews list)

review: Approve

[lp:~pete-woods/camera-app/handle-quit-signal]

249. By Bill Filler on 2014-03-06

click support

250. By PS Jenkins bot on 2014-03-06

Releasing 2.9.1+14.04.20140306-0ubuntu1

251. By Launchpad Translations on behalf of phablet-team on 2014-03-07

Launchpad automatic translations update.

[Pete Woods (pete-woods)]

No worries, I understand you guys get _lot_ of email!

[lp:~pete-woods/camera-app/handle-quit-signal]

252. By Launchpad Translations on behalf of phablet-team on 2014-03-11

Launchpad automatic translations update.

254. By Pete Woods on 2014-02-10

Update control file with new version constraints

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:254
http://jenkins.qa.ubuntu.com/job/camera-app-ci/170/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-trusty-amd64-ci/28
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-trusty-armhf-ci/28
        deb: http://jenkins.qa.ubuntu.com/job/camera-app-trusty-armhf-ci/28/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-trusty-i386-ci/28
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/3845
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/3430
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/3373
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/3869
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/3869/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/3432
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/3432/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/5790
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/4706

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

review: Approve (continuous-integration)

=== modified file 'camera-app.qml'
--- camera-app.qml	2014-01-24 21:05:20 +0000
+++ camera-app.qml	2014-03-12 10:12:06 +0000
@@ -16,7 +16,7 @@
 
 import QtQuick 2.0
 import Ubuntu.Components 0.1
-import Ubuntu.Unity.Action 1.0 as UnityActions
+import Ubuntu.Unity.Action 1.1 as UnityActions
 import QtMultimedia 5.0
 import CameraApp 0.1
 import QtQuick.Window 2.0
@@ -57,6 +57,10 @@
                 keywords: i18n.tr("Lighting Condition;Day;Cloudy;Inside")
             }
         ]
+
+        onQuit: {
+            Qt.quit()
+        }
     }
 
     Component.onCompleted: {

=== modified file 'debian/control'
--- debian/control	2013-11-18 10:15:15 +0000
+++ debian/control	2014-03-12 10:12:06 +0000
@@ -14,7 +14,7 @@
                qtdeclarative5-qtquick2-plugin,
                qtdeclarative5-test-plugin,
                qtdeclarative5-ubuntu-ui-toolkit-plugin,
-               qtdeclarative5-unity-action-plugin,
+               qtdeclarative5-unity-action-plugin (>= 1.1.0),
                qtdeclarative5-usermetrics0.1,
                qtmultimedia5-dev,
                libusermetricsinput1-dev,
@@ -33,7 +33,7 @@
          qtdeclarative5-qtmultimedia-plugin | libqt5declarative5-qtmultimedia-plugin,
          qtdeclarative5-qtquick2-plugin,
          qtdeclarative5-ubuntu-ui-toolkit-plugin,
-         qtdeclarative5-unity-action-plugin,
+         qtdeclarative5-unity-action-plugin (>= 1.1.0),
          qtdeclarative5-window-plugin,
          qtdeclarative5-usermetrics0.1,
          ${misc:Depends},