ubuntu-keyboard

Merge lp:~michael-sheldon/ubuntu-keyboard/update-imports into lp:ubuntu-keyboard

  1. update-imports
  2. Merge into trunk
Proposed by Michael Sheldon
Status: Merged
Approved by: Bill Filler
Approved revision: 436
Merged at revision: 437
Proposed branch: lp:~michael-sheldon/ubuntu-keyboard/update-imports
Merge into: lp:ubuntu-keyboard
Diff against target: 217 lines (+34/-40)
12 files modified
qml/Keyboard.qml (+2/-3)
qml/WordRibbon.qml (+2/-2)
qml/keys/CharKey.qml (+3/-3)
qml/keys/ExtendedKeysSelector.qml (+4/-4)
qml/keys/KeyPopover.qml (+4/-4)
qml/keys/LanguageMenu.qml (+3/-3)
qml/keys/ShiftKey.qml (+2/-2)
tests/autopilot/ubuntu_keyboard/tests/test_keyboard.py (+6/-6)
tests/qmltests/api-test/api_tests.qml (+2/-2)
tests/qmltests/qml-api-tests/tst_inputMethodHints.qml (+2/-3)
tests/qmltests/qml-test-app/keyboard-test.qml (+2/-2)
tests/qmltests/qml-test-app/layout-test.qml (+2/-6)
To merge this branch: bzr merge lp:~michael-sheldon/ubuntu-keyboard/update-imports
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve
Ubuntu Phablet Team Pending
Review via email: mp+281517@code.launchpad.net

Commit message

Switch to Ubuntu.Components 1.3 and QtQuick 2.4

Description of the change

Switch to Ubuntu.Components 1.3 and QtQuick 2.4

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:436
http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-ci/645/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/5913
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-vivid-amd64-ci/144
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-vivid-armhf-ci/145
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-vivid-armhf-ci/145/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-vivid-i386-ci/144
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-touch/4563
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/5924
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/5924/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/26383

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-keyboard-ci/645/rebuild

review: Approve (continuous-integration)
Revision history for this message
Michael Sheldon (michael-sheldon) wrote :

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/ubuntu-keyboard) on device or emulator?

 * Yes

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

 * No change

If you changed UI labels, did you update the pot file?

 * No change

If you changed the packaging (debian), did you add a core-dev as a reviewer to this MP?

 * No change

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'qml/Keyboard.qml'
2--- qml/Keyboard.qml 2015-12-18 03:19:59 +0000
3+++ qml/Keyboard.qml 2016-01-04 14:18:59 +0000
4@@ -29,12 +29,11 @@
5 *
6 */
7
8-import QtQuick 2.0
9+import QtQuick 2.4
10 import "constants.js" as Const
11 import "keys/"
12 import "keys/key_constants.js" as UI
13-import Ubuntu.Components 0.1
14-import QtQuick.Window 2.0
15+import Ubuntu.Components 1.3
16
17 Item {
18 id: fullScreenItem
19
20=== modified file 'qml/WordRibbon.qml'
21--- qml/WordRibbon.qml 2015-12-21 11:40:22 +0000
22+++ qml/WordRibbon.qml 2016-01-04 14:18:59 +0000
23@@ -14,8 +14,8 @@
24 * along with this program. If not, see <http://www.gnu.org/licenses/>.
25 */
26
27-import QtQuick 2.0
28-import Ubuntu.Components 0.1
29+import QtQuick 2.4
30+import Ubuntu.Components 1.3
31
32 Rectangle {
33
34
35=== modified file 'qml/keys/CharKey.qml'
36--- qml/keys/CharKey.qml 2015-12-10 17:50:51 +0000
37+++ qml/keys/CharKey.qml 2016-01-04 14:18:59 +0000
38@@ -14,10 +14,10 @@
39 * along with this program. If not, see <http://www.gnu.org/licenses/>.
40 */
41
42-import QtQuick 2.0
43+import QtQuick 2.4
44 import QtMultimedia 5.0
45-import Ubuntu.Components 0.1
46-import Ubuntu.Components.Popups 0.1
47+import Ubuntu.Components 1.3
48+import Ubuntu.Components.Popups 1.3
49
50 import "key_constants.js" as UI
51
52
53=== modified file 'qml/keys/ExtendedKeysSelector.qml'
54--- qml/keys/ExtendedKeysSelector.qml 2015-02-23 13:37:26 +0000
55+++ qml/keys/ExtendedKeysSelector.qml 2016-01-04 14:18:59 +0000
56@@ -14,11 +14,11 @@
57 * along with this program. If not, see <http://www.gnu.org/licenses/>.
58 */
59
60-import QtQuick 2.0
61+import QtQuick 2.4
62
63-import Ubuntu.Components 0.1
64-import Ubuntu.Components.ListItems 0.1 as ListItem
65-import Ubuntu.Components.Popups 0.1
66+import Ubuntu.Components 1.3
67+import Ubuntu.Components.ListItems 1.3 as ListItem
68+import Ubuntu.Components.Popups 1.3
69
70 import QtQuick.Window 2.0
71
72
73=== modified file 'qml/keys/KeyPopover.qml'
74--- qml/keys/KeyPopover.qml 2014-08-08 12:42:52 +0000
75+++ qml/keys/KeyPopover.qml 2016-01-04 14:18:59 +0000
76@@ -14,11 +14,11 @@
77 * along with this program. If not, see <http://www.gnu.org/licenses/>.
78 */
79
80-import QtQuick 2.0
81+import QtQuick 2.4
82
83-import Ubuntu.Components 0.1
84-import Ubuntu.Components.ListItems 0.1 as ListItem
85-import Ubuntu.Components.Popups 0.1
86+import Ubuntu.Components 1.3
87+import Ubuntu.Components.ListItems 1.3 as ListItem
88+import Ubuntu.Components.Popups 1.3
89
90 import QtQuick.Window 2.0
91
92
93=== modified file 'qml/keys/LanguageMenu.qml'
94--- qml/keys/LanguageMenu.qml 2015-05-11 11:50:24 +0000
95+++ qml/keys/LanguageMenu.qml 2016-01-04 14:18:59 +0000
96@@ -14,9 +14,9 @@
97 * along with this program. If not, see <http://www.gnu.org/licenses/>.
98 */
99
100-import QtQuick 2.0
101-import Ubuntu.Components 0.1
102-import Ubuntu.Components.ListItems 0.1 as ListItem
103+import QtQuick 2.4
104+import Ubuntu.Components 1.3
105+import Ubuntu.Components.ListItems 1.3 as ListItem
106
107 import "key_constants.js" as UI
108
109
110=== modified file 'qml/keys/ShiftKey.qml'
111--- qml/keys/ShiftKey.qml 2014-08-22 15:45:03 +0000
112+++ qml/keys/ShiftKey.qml 2016-01-04 14:18:59 +0000
113@@ -14,8 +14,8 @@
114 * along with this program. If not, see <http://www.gnu.org/licenses/>.
115 */
116
117-import QtQuick 2.0
118-import Ubuntu.Components 0.1
119+import QtQuick 2.4
120+import Ubuntu.Components 1.3
121
122 ActionKey {
123 iconNormal: "keyboard-caps"
124
125=== modified file 'tests/autopilot/ubuntu_keyboard/tests/test_keyboard.py'
126--- tests/autopilot/ubuntu_keyboard/tests/test_keyboard.py 2015-12-18 14:00:14 +0000
127+++ tests/autopilot/ubuntu_keyboard/tests/test_keyboard.py 2016-01-04 14:18:59 +0000
128@@ -135,8 +135,8 @@
129 extra_script = "|".join(input_hints)
130
131 simple_script = dedent("""
132- import QtQuick 2.0
133- import Ubuntu.Components 0.1
134+ import QtQuick 2.4
135+ import Ubuntu.Components 1.3
136
137 Rectangle {
138 id: window
139@@ -522,8 +522,8 @@
140 sleep(10)
141
142 qml = dedent("""
143- import QtQuick 2.0
144- import Ubuntu.Components 0.1
145+ import QtQuick 2.4
146+ import Ubuntu.Components 1.3
147
148 Rectangle {
149 id: window
150@@ -1139,8 +1139,8 @@
151
152 """
153 qml = dedent("""
154- import QtQuick 2.0
155- import Ubuntu.Components 1.1
156+ import QtQuick 2.4
157+ import Ubuntu.Components 1.3
158 import Ubuntu.Web 0.2
159
160 Rectangle {
161
162=== modified file 'tests/qmltests/api-test/api_tests.qml'
163--- tests/qmltests/api-test/api_tests.qml 2013-10-24 10:17:12 +0000
164+++ tests/qmltests/api-test/api_tests.qml 2016-01-04 14:18:59 +0000
165@@ -1,6 +1,6 @@
166-import QtQuick 2.0
167+import QtQuick 2.4
168 import QtTest 1.0
169-import Ubuntu.Components 0.1
170+import Ubuntu.Components 1.3
171
172 /*
173 tests for API exposed to the app in QML
174
175=== modified file 'tests/qmltests/qml-api-tests/tst_inputMethodHints.qml'
176--- tests/qmltests/qml-api-tests/tst_inputMethodHints.qml 2013-08-09 15:22:29 +0000
177+++ tests/qmltests/qml-api-tests/tst_inputMethodHints.qml 2016-01-04 14:18:59 +0000
178@@ -1,7 +1,6 @@
179-
180-import QtQuick 2.0
181+import QtQuick 2.4
182 import QtTest 1.0 // for TestCase
183-import Ubuntu.Components 0.1
184+import Ubuntu.Components 1.3
185 import MaliitTestSupport 1.0
186
187 /*
188
189=== modified file 'tests/qmltests/qml-test-app/keyboard-test.qml'
190--- tests/qmltests/qml-test-app/keyboard-test.qml 2013-07-19 12:05:07 +0000
191+++ tests/qmltests/qml-test-app/keyboard-test.qml 2016-01-04 14:18:59 +0000
192@@ -1,7 +1,7 @@
193
194
195-import QtQuick 2.0
196-import Ubuntu.Components 0.1
197+import QtQuick 2.4
198+import Ubuntu.Components 1.3
199
200 MainView {
201 id: root
202
203=== modified file 'tests/qmltests/qml-test-app/layout-test.qml'
204--- tests/qmltests/qml-test-app/layout-test.qml 2013-09-18 16:30:09 +0000
205+++ tests/qmltests/qml-test-app/layout-test.qml 2016-01-04 14:18:59 +0000
206@@ -1,9 +1,5 @@
207-import QtQuick 2.0
208-
209-
210-
211-import QtQuick 2.0
212-import Ubuntu.Components 0.1
213+import QtQuick 2.4
214+import Ubuntu.Components 1.3
215
216 MainView {
217 id: root

Subscribers

People subscribed via source and target branches