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

Proposed by Pete Woods on 2014-02-10
Status: Merged
Merged at revision: 257
Proposed branch: lp:~pete-woods/camera-app/handle-quit-signal
Merge into: lp:camera-app
Diff against target: 45 lines (+7/-3)
2 files modified
camera-app.qml (+5/-1)
debian/control (+2/-2)
To merge this branch: bzr merge lp:~pete-woods/camera-app/handle-quit-signal
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve on 2014-03-12
Sebastien Bacher 2014-02-14 Approve on 2014-03-06
Dimitri John Ledkov 2014-02-14 Approve on 2014-02-26
Antti Kaijanmäki (community) 2014-02-10 Abstain on 2014-02-17
Review via email: mp+205546@code.launchpad.net

Commit message

Handle the HUD quit signal

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

Description of the change

> 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>

To post a comment you must log in.
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Antti Kaijanmäki (kaijanmaki) wrote :

Checklist missing.

review: Needs Fixing
Pete Woods (pete-woods) wrote :

Adding seb128 to check my packaging changes.

PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
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) wrote :

waiting for a silo to be linked.

review: Abstain
Antti Kaijanmäki (kaijanmaki) wrote :

The code itself looks good to me.

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

Launchpad automatic translations update.

Dimitri John Ledkov (xnox) wrote :

claiming core-dev review. All is good.

review: Approve
Pete Woods (pete-woods) wrote :

Thanks, Dimitri :)

Sebastien Bacher (seb128) wrote :

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

review: Approve
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) wrote :

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

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) wrote :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
1616
17import QtQuick 2.017import QtQuick 2.0
18import Ubuntu.Components 0.118import Ubuntu.Components 0.1
19import Ubuntu.Unity.Action 1.0 as UnityActions19import Ubuntu.Unity.Action 1.1 as UnityActions
20import QtMultimedia 5.020import QtMultimedia 5.0
21import CameraApp 0.121import CameraApp 0.1
22import QtQuick.Window 2.022import QtQuick.Window 2.0
@@ -57,6 +57,10 @@
57 keywords: i18n.tr("Lighting Condition;Day;Cloudy;Inside")57 keywords: i18n.tr("Lighting Condition;Day;Cloudy;Inside")
58 }58 }
59 ]59 ]
60
61 onQuit: {
62 Qt.quit()
63 }
60 }64 }
6165
62 Component.onCompleted: {66 Component.onCompleted: {
6367
=== 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 @@
14 qtdeclarative5-qtquick2-plugin,14 qtdeclarative5-qtquick2-plugin,
15 qtdeclarative5-test-plugin,15 qtdeclarative5-test-plugin,
16 qtdeclarative5-ubuntu-ui-toolkit-plugin,16 qtdeclarative5-ubuntu-ui-toolkit-plugin,
17 qtdeclarative5-unity-action-plugin,17 qtdeclarative5-unity-action-plugin (>= 1.1.0),
18 qtdeclarative5-usermetrics0.1,18 qtdeclarative5-usermetrics0.1,
19 qtmultimedia5-dev,19 qtmultimedia5-dev,
20 libusermetricsinput1-dev,20 libusermetricsinput1-dev,
@@ -33,7 +33,7 @@
33 qtdeclarative5-qtmultimedia-plugin | libqt5declarative5-qtmultimedia-plugin,33 qtdeclarative5-qtmultimedia-plugin | libqt5declarative5-qtmultimedia-plugin,
34 qtdeclarative5-qtquick2-plugin,34 qtdeclarative5-qtquick2-plugin,
35 qtdeclarative5-ubuntu-ui-toolkit-plugin,35 qtdeclarative5-ubuntu-ui-toolkit-plugin,
36 qtdeclarative5-unity-action-plugin,36 qtdeclarative5-unity-action-plugin (>= 1.1.0),
37 qtdeclarative5-window-plugin,37 qtdeclarative5-window-plugin,
38 qtdeclarative5-usermetrics0.1,38 qtdeclarative5-usermetrics0.1,
39 ${misc:Depends},39 ${misc:Depends},

Subscribers

People subscribed via source and target branches