messaging-app

Merge lp:~tiagosh/messaging-app/port-sdk-1.3 into lp:messaging-app

  1. port-sdk-1.3
  2. Merge into trunk
Proposed by Tiago Salem Herrmann
Status: Merged
Approved by: Bill Filler
Approved revision: 436
Merged at revision: 456
Proposed branch: lp:~tiagosh/messaging-app/port-sdk-1.3
Merge into: lp:messaging-app
Diff against target: 568 lines (+84/-79)
35 files modified
src/qml/AccountSectionDelegate.qml (+2/-2)
src/qml/ContactSearchList.qml (+2/-2)
src/qml/Dialogs/NoDefaultSIMCardDialog.qml (+2/-2)
src/qml/Dialogs/NoSIMCardSelectedDialog.qml (+2/-2)
src/qml/Dialogs/SetDefaultSIMCardDialog.qml (+2/-2)
src/qml/Dialogs/SimLockedDialog.qml (+2/-2)
src/qml/LocalPageWithBottomEdge.qml (+1/-1)
src/qml/LocalTextAreaStyle.qml (+1/-1)
src/qml/MMS/MMSContact.qml (+1/-1)
src/qml/MMS/MMSDefault.qml (+1/-1)
src/qml/MMS/MMSImage.qml (+1/-1)
src/qml/MMS/MMSVideo.qml (+1/-1)
src/qml/MMS/Previewer.qml (+33/-27)
src/qml/MMS/PreviewerContact.qml (+1/-1)
src/qml/MMS/PreviewerImage.qml (+1/-1)
src/qml/MMS/PreviewerVideo.qml (+1/-1)
src/qml/MMSDelegate.qml (+1/-1)
src/qml/MainPage.qml (+2/-2)
src/qml/MessageBubble.qml (+1/-1)
src/qml/MessageDateSection.qml (+2/-2)
src/qml/MessageDelegateFactory.qml (+1/-1)
src/qml/MessageInfoDialog.qml (+2/-2)
src/qml/Messages.qml (+3/-3)
src/qml/MessagesListView.qml (+2/-2)
src/qml/MessagingContactEditorPage.qml (+1/-1)
src/qml/MessagingContactViewPage.qml (+2/-2)
src/qml/MultiRecipientFieldStyle.qml (+1/-1)
src/qml/MultiRecipientInput.qml (+1/-1)
src/qml/NewRecipientPage.qml (+1/-1)
src/qml/PictureImport.qml (+2/-2)
src/qml/SMSDelegate.qml (+1/-1)
src/qml/SettingsPage.qml (+2/-2)
src/qml/SwipeItemDemo.qml (+1/-1)
src/qml/ThreadDelegate.qml (+2/-2)
src/qml/messaging-app.qml (+2/-3)
To merge this branch: bzr merge lp:~tiagosh/messaging-app/port-sdk-1.3
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Needs Fixing
Ubuntu Phablet Team Pending
Review via email: mp+270960@code.launchpad.net

Commit message

Port messaging-app to sdk 1.3.

Description of the change

Port messaging-app to sdk 1.3.

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

FAILED: Continuous integration, rev:432
http://jenkins.qa.ubuntu.com/job/messaging-app-ci/642/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/4159
    SUCCESS: http://jenkins.qa.ubuntu.com/job/messaging-app-vivid-i386-ci/155
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/3395
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4156
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4156/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/23295

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

review: Needs Fixing (continuous-integration)
lp:~tiagosh/messaging-app/port-sdk-1.3 updated
433. By Tiago Salem Herrmann

Fix toolbar in previewer

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:433
http://jenkins.qa.ubuntu.com/job/messaging-app-ci/677/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/4745
    SUCCESS: http://jenkins.qa.ubuntu.com/job/messaging-app-vivid-i386-ci/190
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/3830
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4742
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4742/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/24429

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

review: Needs Fixing (continuous-integration)
lp:~tiagosh/messaging-app/port-sdk-1.3 updated
434. By Tiago Salem Herrmann

Hide header of content picker

435. By Tiago Salem Herrmann

merge trunk

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:434
http://jenkins.qa.ubuntu.com/job/messaging-app-ci/678/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/4774
    SUCCESS: http://jenkins.qa.ubuntu.com/job/messaging-app-vivid-i386-ci/191
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/3849
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4771
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4771/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/24477

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

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:435
http://jenkins.qa.ubuntu.com/job/messaging-app-ci/679/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/4781
    SUCCESS: http://jenkins.qa.ubuntu.com/job/messaging-app-vivid-i386-ci/192
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/3853
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4778
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4778/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/24487

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

review: Needs Fixing (continuous-integration)
lp:~tiagosh/messaging-app/port-sdk-1.3 updated
436. By Tiago Salem Herrmann

merge trunk

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:436
http://jenkins.qa.ubuntu.com/job/messaging-app-ci/680/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/4801
    SUCCESS: http://jenkins.qa.ubuntu.com/job/messaging-app-vivid-i386-ci/193
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/3868
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4798
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4798/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/24532

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/messaging-app-ci/680/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/AccountSectionDelegate.qml'
2--- src/qml/AccountSectionDelegate.qml 2014-10-14 17:47:34 +0000
3+++ src/qml/AccountSectionDelegate.qml 2015-10-23 20:42:15 +0000
4@@ -18,8 +18,8 @@
5
6 import QtQuick 2.2
7
8-import Ubuntu.Components 1.1
9-import Ubuntu.Components.ListItems 0.1 as ListItem
10+import Ubuntu.Components 1.3
11+import Ubuntu.Components.ListItems 1.3 as ListItem
12 import Ubuntu.Contacts 0.1
13
14 import "dateUtils.js" as DateUtils
15
16=== modified file 'src/qml/ContactSearchList.qml'
17--- src/qml/ContactSearchList.qml 2015-03-18 13:44:33 +0000
18+++ src/qml/ContactSearchList.qml 2015-10-23 20:42:15 +0000
19@@ -19,8 +19,8 @@
20 import QtQuick 2.2
21 import QtContacts 5.0
22
23-import Ubuntu.Components 1.1
24-import Ubuntu.Components.ListItems 0.1 as ListItem
25+import Ubuntu.Components 1.3
26+import Ubuntu.Components.ListItems 1.3 as ListItem
27 import Ubuntu.Contacts 0.1
28
29 ListView {
30
31=== modified file 'src/qml/Dialogs/NoDefaultSIMCardDialog.qml'
32--- src/qml/Dialogs/NoDefaultSIMCardDialog.qml 2014-08-15 21:19:49 +0000
33+++ src/qml/Dialogs/NoDefaultSIMCardDialog.qml 2015-10-23 20:42:15 +0000
34@@ -17,8 +17,8 @@
35 */
36
37 import QtQuick 2.0
38-import Ubuntu.Components 1.1
39-import Ubuntu.Components.Popups 0.1
40+import Ubuntu.Components 1.3
41+import Ubuntu.Components.Popups 1.3
42 import Ubuntu.Telephony 0.1
43
44 Component {
45
46=== modified file 'src/qml/Dialogs/NoSIMCardSelectedDialog.qml'
47--- src/qml/Dialogs/NoSIMCardSelectedDialog.qml 2014-08-11 22:22:59 +0000
48+++ src/qml/Dialogs/NoSIMCardSelectedDialog.qml 2015-10-23 20:42:15 +0000
49@@ -17,8 +17,8 @@
50 */
51
52 import QtQuick 2.0
53-import Ubuntu.Components 1.1
54-import Ubuntu.Components.Popups 0.1
55+import Ubuntu.Components 1.3
56+import Ubuntu.Components.Popups 1.3
57
58 Component {
59 Dialog {
60
61=== modified file 'src/qml/Dialogs/SetDefaultSIMCardDialog.qml'
62--- src/qml/Dialogs/SetDefaultSIMCardDialog.qml 2014-08-20 14:26:35 +0000
63+++ src/qml/Dialogs/SetDefaultSIMCardDialog.qml 2015-10-23 20:42:15 +0000
64@@ -17,8 +17,8 @@
65 */
66
67 import QtQuick 2.0
68-import Ubuntu.Components 1.1
69-import Ubuntu.Components.Popups 0.1
70+import Ubuntu.Components 1.3
71+import Ubuntu.Components.Popups 1.3
72 import Ubuntu.Telephony 0.1
73
74 Component {
75
76=== modified file 'src/qml/Dialogs/SimLockedDialog.qml'
77--- src/qml/Dialogs/SimLockedDialog.qml 2014-10-01 15:57:46 +0000
78+++ src/qml/Dialogs/SimLockedDialog.qml 2015-10-23 20:42:15 +0000
79@@ -17,8 +17,8 @@
80 */
81
82 import QtQuick 2.0
83-import Ubuntu.Components 1.1
84-import Ubuntu.Components.Popups 0.1
85+import Ubuntu.Components 1.3
86+import Ubuntu.Components.Popups 1.3
87
88 Component {
89 Dialog {
90
91=== modified file 'src/qml/LocalPageWithBottomEdge.qml'
92--- src/qml/LocalPageWithBottomEdge.qml 2014-10-01 19:54:08 +0000
93+++ src/qml/LocalPageWithBottomEdge.qml 2015-10-23 20:42:15 +0000
94@@ -63,7 +63,7 @@
95 */
96
97 import QtQuick 2.2
98-import Ubuntu.Components 1.1
99+import Ubuntu.Components 1.3
100
101 Page {
102 id: page
103
104=== modified file 'src/qml/LocalTextAreaStyle.qml'
105--- src/qml/LocalTextAreaStyle.qml 2015-02-25 20:48:06 +0000
106+++ src/qml/LocalTextAreaStyle.qml 2015-10-23 20:42:15 +0000
107@@ -14,7 +14,7 @@
108 * along with this program. If not, see <http://www.gnu.org/licenses/>.
109 */
110
111-import Ubuntu.Components.Themes.Ambiance 1.0
112+import Ubuntu.Components.Themes.Ambiance 1.3
113
114 TextAreaStyle {
115 background: null
116
117=== modified file 'src/qml/MMS/MMSContact.qml'
118--- src/qml/MMS/MMSContact.qml 2015-06-10 23:12:40 +0000
119+++ src/qml/MMS/MMSContact.qml 2015-10-23 20:42:15 +0000
120@@ -17,7 +17,7 @@
121 */
122
123 import QtQuick 2.2
124-import Ubuntu.Components 1.1
125+import Ubuntu.Components 1.3
126 import Ubuntu.Contacts 0.1
127 import Ubuntu.History 0.1
128
129
130=== modified file 'src/qml/MMS/MMSDefault.qml'
131--- src/qml/MMS/MMSDefault.qml 2015-02-27 21:41:28 +0000
132+++ src/qml/MMS/MMSDefault.qml 2015-10-23 20:42:15 +0000
133@@ -17,7 +17,7 @@
134 */
135
136 import QtQuick 2.2
137-import Ubuntu.Components 1.1
138+import Ubuntu.Components 1.3
139 import ".."
140
141 MMSBase {
142
143=== modified file 'src/qml/MMS/MMSImage.qml'
144--- src/qml/MMS/MMSImage.qml 2014-08-29 14:06:26 +0000
145+++ src/qml/MMS/MMSImage.qml 2015-10-23 20:42:15 +0000
146@@ -17,7 +17,7 @@
147 */
148
149 import QtQuick 2.2
150-import Ubuntu.Components 1.1
151+import Ubuntu.Components 1.3
152
153 MMSBase {
154 id: imageDelegate
155
156=== modified file 'src/qml/MMS/MMSVideo.qml'
157--- src/qml/MMS/MMSVideo.qml 2014-08-11 22:59:14 +0000
158+++ src/qml/MMS/MMSVideo.qml 2015-10-23 20:42:15 +0000
159@@ -17,7 +17,7 @@
160 */
161
162 import QtQuick 2.2
163-import Ubuntu.Components 1.1
164+import Ubuntu.Components 1.3
165 import QtMultimedia 5.0
166 import ".."
167
168
169=== modified file 'src/qml/MMS/Previewer.qml'
170--- src/qml/MMS/Previewer.qml 2014-08-29 21:59:55 +0000
171+++ src/qml/MMS/Previewer.qml 2015-10-23 20:42:15 +0000
172@@ -17,40 +17,43 @@
173 */
174
175 import QtQuick 2.2
176-import Ubuntu.Components 1.1
177+import Ubuntu.Components 1.3
178 import Ubuntu.Content 0.1
179 import ".."
180
181 Page {
182+ id: previewerPage
183 title: ""
184 property variant attachment
185 signal actionTriggered
186- tools: ToolbarItems {
187- ToolbarButton {
188- objectName: "saveButton"
189- action: Action {
190- text: i18n.tr("Save")
191- iconSource: "image://theme/save"
192- onTriggered: {
193- mainStack.push(picker, {"url": attachment.filePath, "handler": ContentHandler.Destination});
194- actionTriggered()
195- }
196- }
197- }
198-
199- ToolbarButton {
200- objectName: "shareButton"
201- action: Action {
202- iconSource: "image://theme/share"
203- text: i18n.tr("Share")
204- onTriggered: {
205- mainStack.push(picker, {"url": attachment.filePath, "handler": ContentHandler.Share});
206- actionTriggered()
207- }
208- }
209- }
210- }
211-
212+ state: "default"
213+ states: [
214+ PageHeadState {
215+ name: "default"
216+ head: previewerPage.head
217+ actions: [
218+ Action {
219+ objectName: "saveButton"
220+ text: i18n.tr("Save")
221+ iconSource: "image://theme/save"
222+ onTriggered: {
223+ mainStack.push(picker, {"url": attachment.filePath, "handler": ContentHandler.Destination});
224+ actionTriggered()
225+ }
226+ },
227+ Action {
228+ objectName: "shareButton"
229+ iconSource: "image://theme/share"
230+ text: i18n.tr("Share")
231+ onTriggered: {
232+ mainStack.push(picker, {"url": attachment.filePath, "handler": ContentHandler.Share});
233+ actionTriggered()
234+ }
235+ }
236+ ]
237+ }
238+ ]
239+
240 Component {
241 id: resultComponent
242 ContentItem {}
243@@ -72,6 +75,9 @@
244 }
245 }
246
247+ // invisible header
248+ header: Item { height: 0 }
249+
250 ContentPeerPicker {
251 visible: parent.visible
252 contentType: picker.contentType
253
254=== modified file 'src/qml/MMS/PreviewerContact.qml'
255--- src/qml/MMS/PreviewerContact.qml 2015-06-10 23:12:40 +0000
256+++ src/qml/MMS/PreviewerContact.qml 2015-10-23 20:42:15 +0000
257@@ -17,7 +17,7 @@
258 */
259
260 import QtQuick 2.2
261-import Ubuntu.Components 1.1
262+import Ubuntu.Components 1.3
263 import Ubuntu.Content 0.1
264 import ".."
265
266
267=== modified file 'src/qml/MMS/PreviewerImage.qml'
268--- src/qml/MMS/PreviewerImage.qml 2014-08-21 16:12:06 +0000
269+++ src/qml/MMS/PreviewerImage.qml 2015-10-23 20:42:15 +0000
270@@ -17,7 +17,7 @@
271 */
272
273 import QtQuick 2.2
274-import Ubuntu.Components 1.1
275+import Ubuntu.Components 1.3
276 import Ubuntu.Content 0.1
277 import ".."
278
279
280=== modified file 'src/qml/MMS/PreviewerVideo.qml'
281--- src/qml/MMS/PreviewerVideo.qml 2014-08-11 22:59:14 +0000
282+++ src/qml/MMS/PreviewerVideo.qml 2015-10-23 20:42:15 +0000
283@@ -17,7 +17,7 @@
284 */
285
286 import QtQuick 2.2
287-import Ubuntu.Components 1.1
288+import Ubuntu.Components 1.3
289 import QtMultimedia 5.0
290 import ".."
291
292
293=== modified file 'src/qml/MMSDelegate.qml'
294--- src/qml/MMSDelegate.qml 2015-10-09 18:21:53 +0000
295+++ src/qml/MMSDelegate.qml 2015-10-23 20:42:15 +0000
296@@ -17,7 +17,7 @@
297 */
298
299 import QtQuick 2.2
300-import Ubuntu.Components 1.1
301+import Ubuntu.Components 1.3
302 import Ubuntu.Telephony 0.1
303
304 MessageDelegate {
305
306=== modified file 'src/qml/MainPage.qml'
307--- src/qml/MainPage.qml 2015-10-08 22:00:25 +0000
308+++ src/qml/MainPage.qml 2015-10-23 20:42:15 +0000
309@@ -17,8 +17,8 @@
310 */
311
312 import QtQuick 2.2
313-import Ubuntu.Components 1.1
314-import Ubuntu.Components.ListItems 0.1 as ListItem
315+import Ubuntu.Components 1.3
316+import Ubuntu.Components.ListItems 1.3 as ListItem
317 import Ubuntu.Contacts 0.1
318 import Ubuntu.History 0.1
319 import "dateUtils.js" as DateUtils
320
321=== modified file 'src/qml/MessageBubble.qml'
322--- src/qml/MessageBubble.qml 2015-10-06 15:12:51 +0000
323+++ src/qml/MessageBubble.qml 2015-10-23 20:42:15 +0000
324@@ -17,7 +17,7 @@
325 */
326
327 import QtQuick 2.2
328-import Ubuntu.Components 1.1
329+import Ubuntu.Components 1.3
330 import Ubuntu.History 0.1
331 import Ubuntu.Telephony.PhoneNumber 0.1 as PhoneNumber
332
333
334=== modified file 'src/qml/MessageDateSection.qml'
335--- src/qml/MessageDateSection.qml 2014-09-24 19:57:31 +0000
336+++ src/qml/MessageDateSection.qml 2015-10-23 20:42:15 +0000
337@@ -17,8 +17,8 @@
338 */
339
340 import QtQuick 2.2
341-import Ubuntu.Components 1.1
342-import Ubuntu.Components.ListItems 0.1 as ListItem
343+import Ubuntu.Components 1.3
344+import Ubuntu.Components.ListItems 1.3 as ListItem
345
346 Item {
347 property alias text: label.text
348
349=== modified file 'src/qml/MessageDelegateFactory.qml'
350--- src/qml/MessageDelegateFactory.qml 2015-05-21 18:52:13 +0000
351+++ src/qml/MessageDelegateFactory.qml 2015-10-23 20:42:15 +0000
352@@ -17,7 +17,7 @@
353 */
354
355 import QtQuick 2.2
356-import Ubuntu.Components 1.1
357+import Ubuntu.Components 1.3
358 import Ubuntu.Contacts 0.1
359 import Ubuntu.History 0.1
360
361
362=== modified file 'src/qml/MessageInfoDialog.qml'
363--- src/qml/MessageInfoDialog.qml 2015-10-13 18:58:11 +0000
364+++ src/qml/MessageInfoDialog.qml 2015-10-23 20:42:15 +0000
365@@ -17,8 +17,8 @@
366 */
367
368 import QtQuick 2.2
369-import Ubuntu.Components 1.1
370-import Ubuntu.Components.Popups 0.1
371+import Ubuntu.Components 1.3
372+import Ubuntu.Components.Popups 1.3
373 import Ubuntu.History 0.1
374 import Ubuntu.Telephony.PhoneNumber 0.1 as PhoneUtils
375
376
377=== modified file 'src/qml/Messages.qml'
378--- src/qml/Messages.qml 2015-10-15 13:49:54 +0000
379+++ src/qml/Messages.qml 2015-10-23 20:42:15 +0000
380@@ -18,9 +18,9 @@
381
382 import QtQuick 2.2
383 import QtQuick.Window 2.0
384-import Ubuntu.Components 1.1
385-import Ubuntu.Components.ListItems 0.1 as ListItem
386-import Ubuntu.Components.Popups 0.1
387+import Ubuntu.Components 1.3
388+import Ubuntu.Components.ListItems 1.3 as ListItem
389+import Ubuntu.Components.Popups 1.3
390 import Ubuntu.Content 0.1
391 import Ubuntu.History 0.1
392 import Ubuntu.Telephony 0.1
393
394=== modified file 'src/qml/MessagesListView.qml'
395--- src/qml/MessagesListView.qml 2015-10-01 19:42:51 +0000
396+++ src/qml/MessagesListView.qml 2015-10-23 20:42:15 +0000
397@@ -18,8 +18,8 @@
398
399 import QtQuick 2.2
400
401-import Ubuntu.Components 1.1
402-import Ubuntu.Components.ListItems 0.1 as ListItem
403+import Ubuntu.Components 1.3
404+import Ubuntu.Components.ListItems 1.3 as ListItem
405 import Ubuntu.Contacts 0.1
406 import Ubuntu.History 0.1
407
408
409=== modified file 'src/qml/MessagingContactEditorPage.qml'
410--- src/qml/MessagingContactEditorPage.qml 2015-04-30 22:06:35 +0000
411+++ src/qml/MessagingContactEditorPage.qml 2015-10-23 20:42:15 +0000
412@@ -19,7 +19,7 @@
413 import QtQuick 2.2
414 import QtContacts 5.0
415
416-import Ubuntu.Components 1.1
417+import Ubuntu.Components 1.3
418
419 import Ubuntu.AddressBook.ContactEditor 0.1
420
421
422=== modified file 'src/qml/MessagingContactViewPage.qml'
423--- src/qml/MessagingContactViewPage.qml 2015-06-01 20:15:09 +0000
424+++ src/qml/MessagingContactViewPage.qml 2015-10-23 20:42:15 +0000
425@@ -20,8 +20,8 @@
426 import QtQuick 2.2
427 import QtContacts 5.0
428
429-import Ubuntu.Components 1.1
430-import Ubuntu.Components.Popups 1.0 as Popups
431+import Ubuntu.Components 1.3
432+import Ubuntu.Components.Popups 1.3 as Popups
433 import Ubuntu.Contacts 0.1
434
435 import Ubuntu.AddressBook.Base 0.1
436
437=== modified file 'src/qml/MultiRecipientFieldStyle.qml'
438--- src/qml/MultiRecipientFieldStyle.qml 2015-02-24 13:53:11 +0000
439+++ src/qml/MultiRecipientFieldStyle.qml 2015-10-23 20:42:15 +0000
440@@ -14,7 +14,7 @@
441 * along with this program. If not, see <http://www.gnu.org/licenses/>.
442 */
443
444-import Ubuntu.Components.Themes.Ambiance 1.0
445+import Ubuntu.Components.Themes.Ambiance 1.3
446
447 TextFieldStyle {
448 background: null
449
450=== modified file 'src/qml/MultiRecipientInput.qml'
451--- src/qml/MultiRecipientInput.qml 2015-03-18 13:44:33 +0000
452+++ src/qml/MultiRecipientInput.qml 2015-10-23 20:42:15 +0000
453@@ -17,7 +17,7 @@
454 */
455
456 import QtQuick 2.2
457-import Ubuntu.Components 1.1
458+import Ubuntu.Components 1.3
459 import Ubuntu.Contacts 0.1
460 import Ubuntu.Telephony 0.1
461 import QtContacts 5.0
462
463=== modified file 'src/qml/NewRecipientPage.qml'
464--- src/qml/NewRecipientPage.qml 2015-05-13 19:37:01 +0000
465+++ src/qml/NewRecipientPage.qml 2015-10-23 20:42:15 +0000
466@@ -17,7 +17,7 @@
467 */
468
469 import QtQuick 2.2
470-import Ubuntu.Components 1.1
471+import Ubuntu.Components 1.3
472 import Ubuntu.Contacts 0.1
473 import QtContacts 5.0
474
475
476=== modified file 'src/qml/PictureImport.qml'
477--- src/qml/PictureImport.qml 2015-07-10 19:22:32 +0000
478+++ src/qml/PictureImport.qml 2015-10-23 20:42:15 +0000
479@@ -15,8 +15,8 @@
480 */
481
482 import QtQuick 2.2
483-import Ubuntu.Components 1.1
484-import Ubuntu.Components.Popups 1.0 as Popups
485+import Ubuntu.Components 1.3
486+import Ubuntu.Components.Popups 1.3 as Popups
487 import Ubuntu.Content 0.1 as ContentHub
488
489 Item {
490
491=== modified file 'src/qml/SMSDelegate.qml'
492--- src/qml/SMSDelegate.qml 2015-10-09 18:21:53 +0000
493+++ src/qml/SMSDelegate.qml 2015-10-23 20:42:15 +0000
494@@ -17,7 +17,7 @@
495 */
496
497 import QtQuick 2.2
498-import Ubuntu.Components 1.1
499+import Ubuntu.Components 1.3
500
501 import "dateUtils.js" as DateUtils
502
503
504=== modified file 'src/qml/SettingsPage.qml'
505--- src/qml/SettingsPage.qml 2015-04-30 22:47:38 +0000
506+++ src/qml/SettingsPage.qml 2015-10-23 20:42:15 +0000
507@@ -17,8 +17,8 @@
508 */
509
510 import QtQuick 2.2
511-import Ubuntu.Components 1.1
512-import Ubuntu.Components.ListItems 0.1 as ListItem
513+import Ubuntu.Components 1.3
514+import Ubuntu.Components.ListItems 1.3 as ListItem
515 import GSettings 1.0
516
517 Page {
518
519=== modified file 'src/qml/SwipeItemDemo.qml'
520--- src/qml/SwipeItemDemo.qml 2015-07-15 23:10:18 +0000
521+++ src/qml/SwipeItemDemo.qml 2015-10-23 20:42:15 +0000
522@@ -20,7 +20,7 @@
523 import QtQuick.Layouts 1.1
524 import Qt.labs.settings 1.0
525
526-import Ubuntu.Components 1.1
527+import Ubuntu.Components 1.3
528 import Ubuntu.Contacts 0.1
529
530
531
532=== modified file 'src/qml/ThreadDelegate.qml'
533--- src/qml/ThreadDelegate.qml 2015-10-09 19:52:10 +0000
534+++ src/qml/ThreadDelegate.qml 2015-10-23 20:42:15 +0000
535@@ -17,8 +17,8 @@
536 */
537
538 import QtQuick 2.2
539-import Ubuntu.Components 1.1
540-import Ubuntu.Components.Popups 0.1
541+import Ubuntu.Components 1.3
542+import Ubuntu.Components.Popups 1.3
543 import Ubuntu.Telephony 0.1
544 import Ubuntu.Contacts 0.1
545 import QtContacts 5.0
546
547=== modified file 'src/qml/messaging-app.qml'
548--- src/qml/messaging-app.qml 2015-10-08 22:00:25 +0000
549+++ src/qml/messaging-app.qml 2015-10-23 20:42:15 +0000
550@@ -18,8 +18,8 @@
551
552 import QtQuick 2.2
553 import Qt.labs.settings 1.0
554-import Ubuntu.Components 1.1
555-import Ubuntu.Components.Popups 0.1
556+import Ubuntu.Components 1.3
557+import Ubuntu.Components.Popups 1.3
558 import Ubuntu.Telephony 0.1
559 import Ubuntu.Content 0.1
560 import Ubuntu.History 0.1
561@@ -115,7 +115,6 @@
562 automaticOrientation: true
563 width: units.gu(40)
564 height: units.gu(71)
565- useDeprecatedToolbar: false
566 anchorToKeyboard: false
567
568 Component.onCompleted: {

Subscribers

People subscribed via source and target branches