Merge lp:~pete-woods/ubuntu-ui-toolkit/handle-quit-action into lp:ubuntu-ui-toolkit

Proposed by Pete Woods on 2014-01-30
Status: Merged
Approved by: Zsombor Egri on 2014-02-12
Approved revision: 932
Merged at revision: 935
Proposed branch: lp:~pete-woods/ubuntu-ui-toolkit/handle-quit-action
Merge into: lp:ubuntu-ui-toolkit
Diff against target: 123 lines (+13/-9)
8 files modified
debian/control (+2/-2)
modules/Ubuntu/Components/Action.qml (+1/-1)
modules/Ubuntu/Components/MainView.qml (+5/-1)
modules/Ubuntu/Components/Page.qml (+1/-1)
modules/Ubuntu/Components/TextField.qml (+1/-1)
tests/unit/tst_components/tst_checkbox.qml (+1/-1)
tests/unit_x11/tst_components/tst_optionselector.qml (+1/-1)
tests/unit_x11/tst_components/tst_textfield.qml (+1/-1)
To merge this branch: bzr merge lp:~pete-woods/ubuntu-ui-toolkit/handle-quit-action
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve on 2014-02-10
Zsombor Egri 2014-01-30 Approve on 2014-02-10
Ubuntu SDK team 2014-01-30 Pending
Review via email: mp+203964@code.launchpad.net

Commit message

Handle the unity-action-api quit signal

Description of the change

Handle the unity-action-api quit signal

To post a comment you must log in.
930. By Pete Woods on 2014-02-06

Remove this un-necessary line

PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Pete Woods (pete-woods) wrote :

Hi Zsombi,

Seems like Jenkins is happy with this MR, now that its dependencies have been landed.

Any chance you could take a look at it now?

Thanks,
    Pete

931. By Pete Woods on 2014-02-10

Change TODO -> FIXME

932. By Pete Woods on 2014-02-10

Consistently use version 1.1 of unity-action-api

Zsombor Egri (zsombi) wrote :

Seems to be working nicely. Thanks!

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

Thanks for your time!

PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Pete Woods (pete-woods) wrote :

Okay, I've tested this on my devices (N4 and N10) and it seems to work for me.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/control'
2--- debian/control 2014-01-15 06:42:42 +0000
3+++ debian/control 2014-02-10 09:29:15 +0000
4@@ -20,7 +20,7 @@
5 qtdeclarative5-test-plugin,
6 qtdeclarative5-window-plugin,
7 qtdeclarative5-qtfeedback-plugin,
8- qtdeclarative5-unity-action-plugin,
9+ qtdeclarative5-unity-action-plugin (>= 1.1.0),
10 qtdeclarative5-localstorage-plugin,
11 qtdeclarative5-doc-html,
12 qtwebkit5-doc-html,
13@@ -54,7 +54,7 @@
14 qtdeclarative5-qtquick2-plugin,
15 qtdeclarative5-window-plugin,
16 qtdeclarative5-qtfeedback-plugin,
17- qtdeclarative5-unity-action-plugin,
18+ qtdeclarative5-unity-action-plugin (>= 1.1.0),
19 ttf-ubuntu-font-family,
20 ubuntu-ui-toolkit-theme,
21 ${misc:Depends},
22
23=== modified file 'modules/Ubuntu/Components/Action.qml'
24--- modules/Ubuntu/Components/Action.qml 2013-11-22 14:49:12 +0000
25+++ modules/Ubuntu/Components/Action.qml 2014-02-10 09:29:15 +0000
26@@ -15,7 +15,7 @@
27 */
28
29 import QtQuick 2.0
30-import Ubuntu.Unity.Action 1.0 as UnityActions
31+import Ubuntu.Unity.Action 1.1 as UnityActions
32
33 /*!
34 \qmltype Action
35
36=== modified file 'modules/Ubuntu/Components/MainView.qml'
37--- modules/Ubuntu/Components/MainView.qml 2013-12-05 17:28:54 +0000
38+++ modules/Ubuntu/Components/MainView.qml 2014-02-10 09:29:15 +0000
39@@ -15,7 +15,7 @@
40 */
41
42 import QtQuick 2.0
43-import Ubuntu.Unity.Action 1.0 as UnityActions
44+import Ubuntu.Unity.Action 1.1 as UnityActions
45
46 /*!
47 \qmltype MainView
48@@ -384,6 +384,10 @@
49 id: internal
50 UnityActions.ActionManager {
51 id: unityActionManager
52+ onQuit: {
53+ // FIXME Wire this up to the application lifecycle management API instead of quit().
54+ Qt.quit()
55+ }
56 }
57 }
58
59
60=== modified file 'modules/Ubuntu/Components/Page.qml'
61--- modules/Ubuntu/Components/Page.qml 2014-01-13 14:54:01 +0000
62+++ modules/Ubuntu/Components/Page.qml 2014-02-10 09:29:15 +0000
63@@ -15,7 +15,7 @@
64 */
65
66 import QtQuick 2.0
67-import Ubuntu.Unity.Action 1.0 as UnityActions
68+import Ubuntu.Unity.Action 1.1 as UnityActions
69
70 /*!
71 \qmltype Page
72
73=== modified file 'modules/Ubuntu/Components/TextField.qml'
74--- modules/Ubuntu/Components/TextField.qml 2014-01-23 17:17:00 +0000
75+++ modules/Ubuntu/Components/TextField.qml 2014-02-10 09:29:15 +0000
76@@ -15,7 +15,7 @@
77 */
78
79 import QtQuick 2.0
80-import Ubuntu.Unity.Action 1.0 as UnityActions
81+import Ubuntu.Unity.Action 1.1 as UnityActions
82
83 /*!
84 \qmltype TextField
85
86=== modified file 'tests/unit/tst_components/tst_checkbox.qml'
87--- tests/unit/tst_components/tst_checkbox.qml 2013-10-25 11:17:37 +0000
88+++ tests/unit/tst_components/tst_checkbox.qml 2014-02-10 09:29:15 +0000
89@@ -17,7 +17,7 @@
90 import QtQuick 2.0
91 import QtTest 1.0
92 import Ubuntu.Components 0.1
93-import Ubuntu.Unity.Action 1.0 as UnityActions
94+import Ubuntu.Unity.Action 1.1 as UnityActions
95
96 TestCase {
97 name: "CheckBoxAPI"
98
99=== modified file 'tests/unit_x11/tst_components/tst_optionselector.qml'
100--- tests/unit_x11/tst_components/tst_optionselector.qml 2013-12-18 12:40:20 +0000
101+++ tests/unit_x11/tst_components/tst_optionselector.qml 2014-02-10 09:29:15 +0000
102@@ -18,7 +18,7 @@
103 import QtTest 1.0
104 import Ubuntu.Components 0.1
105 import Ubuntu.Test 0.1
106-import Ubuntu.Unity.Action 1.0 as UnityActions
107+import Ubuntu.Unity.Action 1.1 as UnityActions
108
109 MainView {
110 width: 400
111
112=== modified file 'tests/unit_x11/tst_components/tst_textfield.qml'
113--- tests/unit_x11/tst_components/tst_textfield.qml 2014-01-29 19:55:41 +0000
114+++ tests/unit_x11/tst_components/tst_textfield.qml 2014-02-10 09:29:15 +0000
115@@ -17,7 +17,7 @@
116 import QtQuick 2.0
117 import QtTest 1.0
118 import Ubuntu.Components 0.1
119-import Ubuntu.Unity.Action 1.0 as UnityActions
120+import Ubuntu.Unity.Action 1.1 as UnityActions
121
122 Item {
123 id: textItem

Subscribers

People subscribed via source and target branches

to status/vote changes: