Ubuntu Terminal App

Merge lp:~kill-animals/ubuntu-terminal-app/update-import-lib-versions into lp:ubuntu-terminal-app

  1. update-import-lib-versions
  2. Merge into trunk
Proposed by Kill Animals
Status: Merged
Approved by: Alan Pope 🍺🐧🐱 🦄
Approved revision: 133
Merged at revision: 147
Proposed branch: lp:~kill-animals/ubuntu-terminal-app/update-import-lib-versions
Merge into: lp:ubuntu-terminal-app
Diff against target: 67 lines (+7/-7)
6 files modified
src/app/qml/Configs.qml (+2/-2)
src/app/qml/Terminal.qml (+1/-1)
src/app/qml/extraPanel/CircleMenu.qml (+1/-1)
src/app/qml/extraPanel/CtrlKeys.qml (+1/-1)
src/app/qml/extraPanel/FnKeys.qml (+1/-1)
src/app/qml/extraPanel/ScrlKeys.qml (+1/-1)
To merge this branch: bzr merge lp:~kill-animals/ubuntu-terminal-app/update-import-lib-versions
Reviewer Review Type Date Requested Status
Alan Pope 🍺🐧🐱 🦄 (community) Approve
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve
Review via email: mp+232973@code.launchpad.net

Commit message

Update lib version imports.

To post a comment you must log in.
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

FAILED: Continuous integration, rev:131
http://91.189.93.70:8080/job/ubuntu-terminal-app-ci/95/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1873/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-terminal-app-utopic-amd64-ci/39/console

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-terminal-app-ci/95/rebuild

review: Needs Fixing (continuous-integration)
lp:~kill-animals/ubuntu-terminal-app/update-import-lib-versions updated
132. By Kill Animals

date updated

133. By Kill Animals

Merged from trunk

Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

PASSED: Continuous integration, rev:133
http://91.189.93.70:8080/job/ubuntu-terminal-app-ci/96/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1936
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1936/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-terminal-app-utopic-amd64-ci/40

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-terminal-app-ci/96/rebuild

review: Approve (continuous-integration)
Revision history for this message
Alan Pope 🍺🐧🐱 🦄 (popey) wrote :

Thank you!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/app/qml/Configs.qml'
2--- src/app/qml/Configs.qml 2014-09-04 03:54:20 +0000
3+++ src/app/qml/Configs.qml 2014-09-08 10:33:47 +0000
4@@ -1,6 +1,6 @@
5 import QtQuick 2.0
6-import Ubuntu.Components 0.1
7-import Ubuntu.Components.ListItems 0.1 as ListItem
8+import Ubuntu.Components 1.1
9+import Ubuntu.Components.ListItems 1.0 as ListItem
10 import "config"
11
12 Item {
13
14=== modified file 'src/app/qml/Terminal.qml'
15--- src/app/qml/Terminal.qml 2014-09-04 03:54:20 +0000
16+++ src/app/qml/Terminal.qml 2014-09-08 10:33:47 +0000
17@@ -1,5 +1,5 @@
18 import QtQuick 2.0
19-import Ubuntu.Components 0.1
20+import Ubuntu.Components 1.1
21 import org.kde.konsole 0.1
22 import "config"
23 import "extraPanel"
24
25=== modified file 'src/app/qml/extraPanel/CircleMenu.qml'
26--- src/app/qml/extraPanel/CircleMenu.qml 2013-05-24 16:18:10 +0000
27+++ src/app/qml/extraPanel/CircleMenu.qml 2014-09-08 10:33:47 +0000
28@@ -1,5 +1,5 @@
29 import QtQuick 2.0
30-import Ubuntu.Components 0.1
31+import Ubuntu.Components 1.1
32 import QtGraphicalEffects 1.0
33
34 Item {
35
36=== modified file 'src/app/qml/extraPanel/CtrlKeys.qml'
37--- src/app/qml/extraPanel/CtrlKeys.qml 2013-12-14 01:19:17 +0000
38+++ src/app/qml/extraPanel/CtrlKeys.qml 2014-09-08 10:33:47 +0000
39@@ -1,5 +1,5 @@
40 import QtQuick 2.0
41-import Ubuntu.Components 0.1
42+import Ubuntu.Components 1.1
43
44 Item {
45 id: mparent
46
47=== modified file 'src/app/qml/extraPanel/FnKeys.qml'
48--- src/app/qml/extraPanel/FnKeys.qml 2013-12-14 01:19:17 +0000
49+++ src/app/qml/extraPanel/FnKeys.qml 2014-09-08 10:33:47 +0000
50@@ -1,5 +1,5 @@
51 import QtQuick 2.0
52-import Ubuntu.Components 0.1
53+import Ubuntu.Components 1.1
54
55 Item {
56 id: mparent
57
58=== modified file 'src/app/qml/extraPanel/ScrlKeys.qml'
59--- src/app/qml/extraPanel/ScrlKeys.qml 2014-08-25 12:56:56 +0000
60+++ src/app/qml/extraPanel/ScrlKeys.qml 2014-09-08 10:33:47 +0000
61@@ -1,5 +1,5 @@
62 import QtQuick 2.0
63-import Ubuntu.Components 0.1
64+import Ubuntu.Components 1.1
65
66 Item {
67 id: mparent

Subscribers

People subscribed via source and target branches