messaging-app

Merge lp:~ken-vandine/messaging-app/lp1554621 into lp:messaging-app

  1. lp1554621
  2. Merge into trunk
Proposed by Ken VanDine
Status: Merged
Approved by: Bill Filler
Approved revision: 529
Merged at revision: 538
Proposed branch: lp:~ken-vandine/messaging-app/lp1554621
Merge into: lp:messaging-app
Diff against target: 116 lines (+9/-9)
9 files modified
src/qml/ComposeBar.qml (+1/-1)
src/qml/ContentImport.qml (+1/-1)
src/qml/MMS/Previewer.qml (+1/-1)
src/qml/MMS/PreviewerImage.qml (+1/-1)
src/qml/MMS/PreviewerMultipleContacts.qml (+1/-1)
src/qml/MMS/PreviewerVideo.qml (+1/-1)
src/qml/Messages.qml (+1/-1)
src/qml/messaging-app.qml (+1/-1)
tests/qml/tst_PreviewerVideo.qml.disabled (+1/-1)
To merge this branch: bzr merge lp:~ken-vandine/messaging-app/lp1554621
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Needs Fixing
Ubuntu Phablet Team Pending
Review via email: mp+289243@code.launchpad.net

Commit message

Bump Ubuntu.Content import to 1.3 to fix theme issue

Description of the change

Bump Ubuntu.Content import to 1.3 to fix theme issue

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

FAILED: Continuous integration, rev:529
http://jenkins.qa.ubuntu.com/job/messaging-app-ci/986/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/6779/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/messaging-app-vivid-i386-ci/495/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6790/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/messaging-app-ci/986/rebuild

review: Needs Fixing (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/qml/ComposeBar.qml'
2--- src/qml/ComposeBar.qml 2016-03-07 21:16:20 +0000
3+++ src/qml/ComposeBar.qml 2016-03-16 16:17:07 +0000
4@@ -21,7 +21,7 @@
5 import Ubuntu.Components 1.3
6 import Ubuntu.Components.ListItems 1.3 as ListItem
7 import Ubuntu.Components.Popups 1.3
8-import Ubuntu.Content 0.1
9+import Ubuntu.Content 1.3
10 import Ubuntu.Telephony 0.1
11 import messagingapp.private 0.1
12 import "Stickers"
13
14=== modified file 'src/qml/ContentImport.qml'
15--- src/qml/ContentImport.qml 2016-02-23 15:07:46 +0000
16+++ src/qml/ContentImport.qml 2016-03-16 16:17:07 +0000
17@@ -17,7 +17,7 @@
18 import QtQuick 2.2
19 import Ubuntu.Components 1.3
20 import Ubuntu.Components.Popups 1.3 as Popups
21-import Ubuntu.Content 0.1 as ContentHub
22+import Ubuntu.Content 1.3 as ContentHub
23
24 Item {
25 id: root
26
27=== modified file 'src/qml/MMS/Previewer.qml'
28--- src/qml/MMS/Previewer.qml 2016-02-01 20:10:42 +0000
29+++ src/qml/MMS/Previewer.qml 2016-03-16 16:17:07 +0000
30@@ -18,7 +18,7 @@
31
32 import QtQuick 2.2
33 import Ubuntu.Components 1.3
34-import Ubuntu.Content 0.1
35+import Ubuntu.Content 1.3
36 import ".."
37
38 Page {
39
40=== modified file 'src/qml/MMS/PreviewerImage.qml'
41--- src/qml/MMS/PreviewerImage.qml 2016-01-25 14:52:57 +0000
42+++ src/qml/MMS/PreviewerImage.qml 2016-03-16 16:17:07 +0000
43@@ -18,7 +18,7 @@
44
45 import QtQuick 2.2
46 import Ubuntu.Components 1.3
47-import Ubuntu.Content 0.1
48+import Ubuntu.Content 1.3
49 import Ubuntu.Thumbnailer 0.1
50 import ".."
51
52
53=== modified file 'src/qml/MMS/PreviewerMultipleContacts.qml'
54--- src/qml/MMS/PreviewerMultipleContacts.qml 2016-02-01 21:01:32 +0000
55+++ src/qml/MMS/PreviewerMultipleContacts.qml 2016-03-16 16:17:07 +0000
56@@ -18,7 +18,7 @@
57
58 import QtQuick 2.4
59 import Ubuntu.Components 1.3
60-import Ubuntu.Content 0.1
61+import Ubuntu.Content 1.3
62 import Ubuntu.Contacts 0.1
63 import Ubuntu.AddressBook.Base 0.1
64 import Ubuntu.AddressBook.ContactView 0.1
65
66=== modified file 'src/qml/MMS/PreviewerVideo.qml'
67--- src/qml/MMS/PreviewerVideo.qml 2016-02-05 01:03:10 +0000
68+++ src/qml/MMS/PreviewerVideo.qml 2016-03-16 16:17:07 +0000
69@@ -19,7 +19,7 @@
70 import QtQuick 2.2
71 import QtMultimedia 5.0
72 import Ubuntu.Components 1.3
73-import Ubuntu.Content 0.1
74+import Ubuntu.Content 1.3
75 import Ubuntu.Thumbnailer 0.1
76 import messagingapp.private 0.1
77 import ".."
78
79=== modified file 'src/qml/Messages.qml'
80--- src/qml/Messages.qml 2016-02-23 15:07:46 +0000
81+++ src/qml/Messages.qml 2016-03-16 16:17:07 +0000
82@@ -21,7 +21,7 @@
83 import Ubuntu.Components 1.3
84 import Ubuntu.Components.ListItems 1.3 as ListItem
85 import Ubuntu.Components.Popups 1.3
86-import Ubuntu.Content 0.1
87+import Ubuntu.Content 1.3
88 import Ubuntu.History 0.1
89 import Ubuntu.Telephony 0.1
90 import Ubuntu.Contacts 0.1
91
92=== modified file 'src/qml/messaging-app.qml'
93--- src/qml/messaging-app.qml 2016-02-24 18:17:55 +0000
94+++ src/qml/messaging-app.qml 2016-03-16 16:17:07 +0000
95@@ -22,7 +22,7 @@
96 import Ubuntu.Components 1.3
97 import Ubuntu.Components.Popups 1.3
98 import Ubuntu.Telephony 0.1
99-import Ubuntu.Content 0.1
100+import Ubuntu.Content 1.3
101 import Ubuntu.History 0.1
102 import "Stickers"
103
104
105=== modified file 'tests/qml/tst_PreviewerVideo.qml.disabled'
106--- tests/qml/tst_PreviewerVideo.qml.disabled 2015-11-30 17:05:25 +0000
107+++ tests/qml/tst_PreviewerVideo.qml.disabled 2016-03-16 16:17:07 +0000
108@@ -21,7 +21,7 @@
109
110 import QtQuick 2.2
111 import QtTest 1.0
112-import Ubuntu.Content 0.1
113+import Ubuntu.Content 1.3
114 import Ubuntu.Test 0.1
115
116 import '../../src/qml/MMS'

Subscribers

People subscribed via source and target branches