Ubuntu Document Viewer App

Merge lp:~kill-animals/ubuntu-docviewer-app/upgrade-ubuntu-components-1.1 into lp:ubuntu-docviewer-app/trunk

  1. upgrade-ubuntu-components-1.1
  2. Merge into trunk
Proposed by Kill Animals
Status: Merged
Approved by: Alan Pope 🍺🐧🐱 🦄
Approved revision: 29
Merged at revision: 33
Proposed branch: lp:~kill-animals/ubuntu-docviewer-app/upgrade-ubuntu-components-1.1
Merge into: lp:ubuntu-docviewer-app/trunk
Diff against target: 72 lines (+9/-11)
6 files modified
ImageView.qml (+1/-1)
PdfPage.qml (+1/-2)
PdfView.qml (+1/-1)
TextView.qml (+1/-2)
UnknowTypeDialog.qml (+2/-2)
ubuntu-docviewer-app.qml (+3/-3)
To merge this branch: bzr merge lp:~kill-animals/ubuntu-docviewer-app/upgrade-ubuntu-components-1.1
Reviewer Review Type Date Requested Status
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve
Andrew Hayzen (community) Approve
Review via email: mp+232991@code.launchpad.net

Commit message

Update component imports.

Description of the change

Update component 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:27
http://91.189.93.70:8080/job/ubuntu-docviewer-app-ci/34/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1872/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-docviewer-app-utopic-amd64-ci/6/console

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

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

PASSED: Continuous integration, rev:28
http://91.189.93.70:8080/job/ubuntu-docviewer-app-ci/38/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1977
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1977/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-docviewer-app-utopic-amd64-ci/10

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

review: Approve (continuous-integration)
Revision history for this message
Andrew Hayzen (ahayzen) wrote :

Looks good so far, I wonder if the framework should be bumped from "ubuntu-sdk-13.10" if we are now going to use the newer Ubuntu.Components?

review: Needs Information
Revision history for this message
Alan Pope 🍺🐧🐱 🦄 (popey) wrote :

Yes, please bump the framework to latest.

Revision history for this message
Andrew Hayzen (ahayzen) wrote :

The framework was bumped in trunk so this is good to land now.

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

FAILED: Autolanding.
More details in the following jenkins job:
http://91.189.93.70:8080/job/ubuntu-docviewer-app-autolanding/18/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/572/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-docviewer-app-utopic-amd64-autolanding/10/console

review: Needs Fixing (continuous-integration)
Revision history for this message
Nekhelesh Ramananthan (nik90) wrote :

Is there anything stopping this from being merged? Akiva, thanks for your code contributions. Can you please follow up with the app developers of the concerned project to ensure your MPs which involve updating library imports either get Merged or Rejected rather than just being ignored in the review queue.

lp:~kill-animals/ubuntu-docviewer-app/upgrade-ubuntu-components-1.1 updated
29. 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:29
http://91.189.93.70:8080/job/ubuntu-docviewer-app-ci/68/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/722
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/722/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-docviewer-app-utopic-amd64-ci/40

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

review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'ImageView.qml'
2--- ImageView.qml 2014-09-20 10:48:59 +0000
3+++ ImageView.qml 2014-10-06 12:33:28 +0000
4@@ -1,5 +1,5 @@
5 import QtQuick 2.3
6-import Ubuntu.Components 0.1
7+import Ubuntu.Components 1.1
8
9 Flickable {
10 id: flickImg
11
12=== modified file 'PdfPage.qml'
13--- PdfPage.qml 2014-09-20 10:48:59 +0000
14+++ PdfPage.qml 2014-10-06 12:33:28 +0000
15@@ -1,6 +1,5 @@
16 import QtQuick 2.3
17-import Ubuntu.Components 0.1
18-
19+import Ubuntu.Components 1.1
20
21 Image
22 {
23
24=== modified file 'PdfView.qml'
25--- PdfView.qml 2014-09-20 10:48:59 +0000
26+++ PdfView.qml 2014-10-06 12:33:28 +0000
27@@ -1,5 +1,5 @@
28 import QtQuick 2.3
29-import Ubuntu.Components 0.1
30+import Ubuntu.Components 1.1
31 import org.docviewer.poppler 1.0
32
33 Flickable {
34
35=== modified file 'TextView.qml'
36--- TextView.qml 2014-09-20 10:48:59 +0000
37+++ TextView.qml 2014-10-06 12:33:28 +0000
38@@ -1,6 +1,5 @@
39 import QtQuick 2.3
40-import Ubuntu.Components 0.1
41-
42+import Ubuntu.Components 1.1
43
44 Flickable {
45 id: flickable
46
47=== modified file 'UnknowTypeDialog.qml'
48--- UnknowTypeDialog.qml 2014-09-20 10:48:59 +0000
49+++ UnknowTypeDialog.qml 2014-10-06 12:33:28 +0000
50@@ -1,6 +1,6 @@
51 import QtQuick 2.3
52-import Ubuntu.Components 0.1
53-import Ubuntu.Components.Popups 0.1
54+import Ubuntu.Components 1.1
55+import Ubuntu.Components.Popups 1.0
56
57 import "loadComponent.js" as LoadComponent
58
59
60=== modified file 'ubuntu-docviewer-app.qml'
61--- ubuntu-docviewer-app.qml 2014-09-26 19:06:14 +0000
62+++ ubuntu-docviewer-app.qml 2014-10-06 12:33:28 +0000
63@@ -1,7 +1,7 @@
64 import QtQuick 2.3
65-import Ubuntu.Components 0.1
66-import Ubuntu.Components.Popups 0.1
67-import Ubuntu.Components.ListItems 0.1 as ListItem
68+import Ubuntu.Components 1.1
69+import Ubuntu.Components.Popups 1.0
70+import Ubuntu.Components.ListItems 1.0 as ListItem
71
72 import org.docviewer.file 1.0
73

Subscribers

People subscribed via source and target branches