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
=== modified file 'qml/Keyboard.qml'
--- qml/Keyboard.qml 2015-12-18 03:19:59 +0000
+++ qml/Keyboard.qml 2016-01-04 14:18:59 +0000
@@ -29,12 +29,11 @@
29 *29 *
30 */30 */
3131
32import QtQuick 2.032import QtQuick 2.4
33import "constants.js" as Const33import "constants.js" as Const
34import "keys/"34import "keys/"
35import "keys/key_constants.js" as UI35import "keys/key_constants.js" as UI
36import Ubuntu.Components 0.136import Ubuntu.Components 1.3
37import QtQuick.Window 2.0
3837
39Item {38Item {
40 id: fullScreenItem39 id: fullScreenItem
4140
=== modified file 'qml/WordRibbon.qml'
--- qml/WordRibbon.qml 2015-12-21 11:40:22 +0000
+++ qml/WordRibbon.qml 2016-01-04 14:18:59 +0000
@@ -14,8 +14,8 @@
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */15 */
1616
17import QtQuick 2.017import QtQuick 2.4
18import Ubuntu.Components 0.118import Ubuntu.Components 1.3
1919
20Rectangle {20Rectangle {
2121
2222
=== modified file 'qml/keys/CharKey.qml'
--- qml/keys/CharKey.qml 2015-12-10 17:50:51 +0000
+++ qml/keys/CharKey.qml 2016-01-04 14:18:59 +0000
@@ -14,10 +14,10 @@
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */15 */
1616
17import QtQuick 2.017import QtQuick 2.4
18import QtMultimedia 5.018import QtMultimedia 5.0
19import Ubuntu.Components 0.119import Ubuntu.Components 1.3
20import Ubuntu.Components.Popups 0.120import Ubuntu.Components.Popups 1.3
2121
22import "key_constants.js" as UI22import "key_constants.js" as UI
2323
2424
=== modified file 'qml/keys/ExtendedKeysSelector.qml'
--- qml/keys/ExtendedKeysSelector.qml 2015-02-23 13:37:26 +0000
+++ qml/keys/ExtendedKeysSelector.qml 2016-01-04 14:18:59 +0000
@@ -14,11 +14,11 @@
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */15 */
1616
17import QtQuick 2.017import QtQuick 2.4
1818
19import Ubuntu.Components 0.119import Ubuntu.Components 1.3
20import Ubuntu.Components.ListItems 0.1 as ListItem20import Ubuntu.Components.ListItems 1.3 as ListItem
21import Ubuntu.Components.Popups 0.121import Ubuntu.Components.Popups 1.3
2222
23import QtQuick.Window 2.023import QtQuick.Window 2.0
2424
2525
=== modified file 'qml/keys/KeyPopover.qml'
--- qml/keys/KeyPopover.qml 2014-08-08 12:42:52 +0000
+++ qml/keys/KeyPopover.qml 2016-01-04 14:18:59 +0000
@@ -14,11 +14,11 @@
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */15 */
1616
17import QtQuick 2.017import QtQuick 2.4
1818
19import Ubuntu.Components 0.119import Ubuntu.Components 1.3
20import Ubuntu.Components.ListItems 0.1 as ListItem20import Ubuntu.Components.ListItems 1.3 as ListItem
21import Ubuntu.Components.Popups 0.121import Ubuntu.Components.Popups 1.3
2222
23import QtQuick.Window 2.023import QtQuick.Window 2.0
2424
2525
=== modified file 'qml/keys/LanguageMenu.qml'
--- qml/keys/LanguageMenu.qml 2015-05-11 11:50:24 +0000
+++ qml/keys/LanguageMenu.qml 2016-01-04 14:18:59 +0000
@@ -14,9 +14,9 @@
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */15 */
1616
17import QtQuick 2.017import QtQuick 2.4
18import Ubuntu.Components 0.118import Ubuntu.Components 1.3
19import Ubuntu.Components.ListItems 0.1 as ListItem19import Ubuntu.Components.ListItems 1.3 as ListItem
2020
21import "key_constants.js" as UI21import "key_constants.js" as UI
2222
2323
=== modified file 'qml/keys/ShiftKey.qml'
--- qml/keys/ShiftKey.qml 2014-08-22 15:45:03 +0000
+++ qml/keys/ShiftKey.qml 2016-01-04 14:18:59 +0000
@@ -14,8 +14,8 @@
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */15 */
1616
17import QtQuick 2.017import QtQuick 2.4
18import Ubuntu.Components 0.118import Ubuntu.Components 1.3
1919
20ActionKey {20ActionKey {
21 iconNormal: "keyboard-caps"21 iconNormal: "keyboard-caps"
2222
=== modified file 'tests/autopilot/ubuntu_keyboard/tests/test_keyboard.py'
--- tests/autopilot/ubuntu_keyboard/tests/test_keyboard.py 2015-12-18 14:00:14 +0000
+++ tests/autopilot/ubuntu_keyboard/tests/test_keyboard.py 2016-01-04 14:18:59 +0000
@@ -135,8 +135,8 @@
135 extra_script = "|".join(input_hints)135 extra_script = "|".join(input_hints)
136136
137 simple_script = dedent("""137 simple_script = dedent("""
138 import QtQuick 2.0138 import QtQuick 2.4
139 import Ubuntu.Components 0.1139 import Ubuntu.Components 1.3
140140
141 Rectangle {141 Rectangle {
142 id: window142 id: window
@@ -522,8 +522,8 @@
522 sleep(10)522 sleep(10)
523523
524 qml = dedent("""524 qml = dedent("""
525 import QtQuick 2.0525 import QtQuick 2.4
526 import Ubuntu.Components 0.1526 import Ubuntu.Components 1.3
527527
528 Rectangle {528 Rectangle {
529 id: window529 id: window
@@ -1139,8 +1139,8 @@
11391139
1140 """1140 """
1141 qml = dedent("""1141 qml = dedent("""
1142 import QtQuick 2.01142 import QtQuick 2.4
1143 import Ubuntu.Components 1.11143 import Ubuntu.Components 1.3
1144 import Ubuntu.Web 0.21144 import Ubuntu.Web 0.2
11451145
1146 Rectangle {1146 Rectangle {
11471147
=== modified file 'tests/qmltests/api-test/api_tests.qml'
--- tests/qmltests/api-test/api_tests.qml 2013-10-24 10:17:12 +0000
+++ tests/qmltests/api-test/api_tests.qml 2016-01-04 14:18:59 +0000
@@ -1,6 +1,6 @@
1import QtQuick 2.01import QtQuick 2.4
2import QtTest 1.02import QtTest 1.0
3import Ubuntu.Components 0.13import Ubuntu.Components 1.3
44
5/*5/*
6 tests for API exposed to the app in QML6 tests for API exposed to the app in QML
77
=== modified file 'tests/qmltests/qml-api-tests/tst_inputMethodHints.qml'
--- tests/qmltests/qml-api-tests/tst_inputMethodHints.qml 2013-08-09 15:22:29 +0000
+++ tests/qmltests/qml-api-tests/tst_inputMethodHints.qml 2016-01-04 14:18:59 +0000
@@ -1,7 +1,6 @@
11import QtQuick 2.4
2import QtQuick 2.0
3import QtTest 1.0 // for TestCase2import QtTest 1.0 // for TestCase
4import Ubuntu.Components 0.13import Ubuntu.Components 1.3
5import MaliitTestSupport 1.04import MaliitTestSupport 1.0
65
7/*6/*
87
=== modified file 'tests/qmltests/qml-test-app/keyboard-test.qml'
--- tests/qmltests/qml-test-app/keyboard-test.qml 2013-07-19 12:05:07 +0000
+++ tests/qmltests/qml-test-app/keyboard-test.qml 2016-01-04 14:18:59 +0000
@@ -1,7 +1,7 @@
11
22
3import QtQuick 2.03import QtQuick 2.4
4import Ubuntu.Components 0.14import Ubuntu.Components 1.3
55
6MainView {6MainView {
7 id: root7 id: root
88
=== modified file 'tests/qmltests/qml-test-app/layout-test.qml'
--- tests/qmltests/qml-test-app/layout-test.qml 2013-09-18 16:30:09 +0000
+++ tests/qmltests/qml-test-app/layout-test.qml 2016-01-04 14:18:59 +0000
@@ -1,9 +1,5 @@
1import QtQuick 2.01import QtQuick 2.4
22import Ubuntu.Components 1.3
3
4
5import QtQuick 2.0
6import Ubuntu.Components 0.1
73
8MainView {4MainView {
9 id: root5 id: root

Subscribers

People subscribed via source and target branches