address-book-app

Merge lp:~ken-vandine/address-book-app/lp1554621 into lp:address-book-app

  1. lp1554621
  2. Merge into trunk
Proposed by Ken VanDine
Status: Merged
Approved by: Bill Filler
Approved revision: 558
Merged at revision: 562
Proposed branch: lp:~ken-vandine/address-book-app/lp1554621
Merge into: lp:address-book-app
Diff against target: 84 lines (+7/-7)
6 files modified
examples/contenthub.qml (+1/-1)
src/imports/ABContactListPage.qml (+1/-1)
src/imports/ContentHubProxy.qml (+1/-1)
src/imports/Ubuntu/AddressBook/Base/ContactExporter.qml (+2/-2)
src/imports/Ubuntu/AddressBook/ContactEditor/AvatarImport.qml (+1/-1)
src/imports/Ubuntu/AddressBook/ContactShare/ContactSharePage.qml (+1/-1)
To merge this branch: bzr merge lp:~ken-vandine/address-book-app/lp1554621
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Needs Fixing
Ubuntu Phablet Team Pending
Review via email: mp+289245@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:558
http://jenkins.qa.ubuntu.com/job/address-book-app-ci/1125/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-app-vivid-i386-ci/428
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/6780
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-touch/5140
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6791
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6791/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/28042

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/address-book-app-ci/1125/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 'examples/contenthub.qml'
2--- examples/contenthub.qml 2015-10-26 13:18:11 +0000
3+++ examples/contenthub.qml 2016-03-16 16:17:31 +0000
4@@ -1,6 +1,6 @@
5 import QtQuick 2.4
6 import Ubuntu.Components 0.1
7-import Ubuntu.Content 0.1
8+import Ubuntu.Content 1.3
9 import QtContacts 5.0
10 import Ubuntu.Components.ListItems 0.1 as ListItem
11
12
13=== modified file 'src/imports/ABContactListPage.qml'
14--- src/imports/ABContactListPage.qml 2016-02-22 14:18:53 +0000
15+++ src/imports/ABContactListPage.qml 2016-03-16 16:17:31 +0000
16@@ -21,7 +21,7 @@
17 import Ubuntu.Components.ListItems 1.3 as ListItem
18 import Ubuntu.Components.Popups 1.3 as Popups
19 import Ubuntu.Contacts 0.1 as ContactsUI
20-import Ubuntu.Content 1.1 as ContentHub
21+import Ubuntu.Content 1.3 as ContentHub
22
23 import Ubuntu.AddressBook.Base 0.1
24 import Ubuntu.AddressBook.ContactShare 0.1
25
26=== modified file 'src/imports/ContentHubProxy.qml'
27--- src/imports/ContentHubProxy.qml 2015-10-26 13:18:11 +0000
28+++ src/imports/ContentHubProxy.qml 2016-03-16 16:17:31 +0000
29@@ -15,7 +15,7 @@
30 */
31
32 import QtQuick 2.4
33-import Ubuntu.Content 0.1 as ContentHub
34+import Ubuntu.Content 1.3 as ContentHub
35
36 QtObject {
37 property QtObject pageStack: null
38
39=== modified file 'src/imports/Ubuntu/AddressBook/Base/ContactExporter.qml'
40--- src/imports/Ubuntu/AddressBook/Base/ContactExporter.qml 2015-11-13 20:41:05 +0000
41+++ src/imports/Ubuntu/AddressBook/Base/ContactExporter.qml 2016-03-16 16:17:31 +0000
42@@ -18,7 +18,7 @@
43 import QtContacts 5.0
44
45 import Ubuntu.Components 1.3
46-import Ubuntu.Content 1.1
47+import Ubuntu.Content 1.3
48 import Ubuntu.Components.Popups 1.3
49
50 Item {
51@@ -112,7 +112,7 @@
52 onExportCompleted: {
53 // send contacts back to source app (pick mode)
54 if (error === ContactModel.ExportNoError) {
55- var obj = Qt.createQmlObject("import Ubuntu.Content 1.1; ContentItem { url: '" + url + "' }", root)
56+ var obj = Qt.createQmlObject("import Ubuntu.Content 1.3; ContentItem { url: '" + url + "' }", root)
57 if (root.activeTransfer) {
58 root.activeTransfer.items = [obj]
59 root.activeTransfer.state = ContentTransfer.Charged
60
61=== modified file 'src/imports/Ubuntu/AddressBook/ContactEditor/AvatarImport.qml'
62--- src/imports/Ubuntu/AddressBook/ContactEditor/AvatarImport.qml 2015-10-28 19:42:30 +0000
63+++ src/imports/Ubuntu/AddressBook/ContactEditor/AvatarImport.qml 2016-03-16 16:17:31 +0000
64@@ -18,7 +18,7 @@
65
66 import Ubuntu.Components 1.3
67 import Ubuntu.Components.Popups 1.3
68-import Ubuntu.Content 0.1
69+import Ubuntu.Content 1.3
70
71 Item {
72 id: root
73
74=== modified file 'src/imports/Ubuntu/AddressBook/ContactShare/ContactSharePage.qml'
75--- src/imports/Ubuntu/AddressBook/ContactShare/ContactSharePage.qml 2016-01-07 12:28:42 +0000
76+++ src/imports/Ubuntu/AddressBook/ContactShare/ContactSharePage.qml 2016-03-16 16:17:31 +0000
77@@ -18,7 +18,7 @@
78 import QtContacts 5.0
79
80 import Ubuntu.Components 1.3
81-import Ubuntu.Content 1.1 as ContentHub
82+import Ubuntu.Content 1.3 as ContentHub
83
84 import Ubuntu.AddressBook.Base 0.1
85

Subscribers

People subscribed via source and target branches