Merge lp:~fboucault/address-book-app/toolkit13 into lp:address-book-app

Proposed by Florian Boucault on 2015-09-03
Status: Merged
Approved by: Renato Araujo Oliveira Filho on 2015-10-23
Approved revision: 472
Merged at revision: 490
Proposed branch: lp:~fboucault/address-book-app/toolkit13
Merge into: lp:address-book-app
Diff against target: 881 lines (+94/-92)
58 files modified
src/imports/ABContactEditorPage.qml (+1/-1)
src/imports/ABContactListPage.qml (+3/-3)
src/imports/ABContactViewPage.qml (+2/-2)
src/imports/MainWindow.qml (+2/-2)
src/imports/Settings/SettingsPage.qml (+2/-2)
src/imports/Ubuntu/AddressBook/Base/ContactDetailBase.qml (+1/-1)
src/imports/Ubuntu/AddressBook/Base/ContactDetailItem.qml (+1/-1)
src/imports/Ubuntu/AddressBook/Base/ContactExporter.qml (+2/-2)
src/imports/Ubuntu/AddressBook/Base/RemoveContactsDialog.qml (+2/-2)
src/imports/Ubuntu/AddressBook/ContactEditor/AvatarImport.qml (+2/-2)
src/imports/Ubuntu/AddressBook/ContactEditor/ComboButtonAddField.qml (+2/-2)
src/imports/Ubuntu/AddressBook/ContactEditor/ContactDetailAvatarEditor.qml (+2/-2)
src/imports/Ubuntu/AddressBook/ContactEditor/ContactDetailGroupWithTypeEditor.qml (+2/-2)
src/imports/Ubuntu/AddressBook/ContactEditor/ContactDetailNameEditor.qml (+1/-1)
src/imports/Ubuntu/AddressBook/ContactEditor/ContactDetailSyncTargetEditor.qml (+2/-2)
src/imports/Ubuntu/AddressBook/ContactEditor/ContactDetailWithTypeEditor.qml (+1/-1)
src/imports/Ubuntu/AddressBook/ContactEditor/ContactEditorPage.qml (+3/-3)
src/imports/Ubuntu/AddressBook/ContactEditor/TextInputDetail.qml (+1/-1)
src/imports/Ubuntu/AddressBook/ContactEditor/ValueSelector.qml (+1/-1)
src/imports/Ubuntu/AddressBook/ContactShare/ContactSharePage.qml (+1/-1)
src/imports/Ubuntu/AddressBook/ContactView/ActionButton.qml (+1/-1)
src/imports/Ubuntu/AddressBook/ContactView/BasicFieldView.qml (+1/-1)
src/imports/Ubuntu/AddressBook/ContactView/ContactDetailAddressesView.qml (+1/-1)
src/imports/Ubuntu/AddressBook/ContactView/ContactDetailAvatarView.qml (+1/-1)
src/imports/Ubuntu/AddressBook/ContactView/ContactDetailEmailsView.qml (+1/-1)
src/imports/Ubuntu/AddressBook/ContactView/ContactDetailGroupWithTypeView.qml (+2/-2)
src/imports/Ubuntu/AddressBook/ContactView/ContactDetailNameView.qml (+1/-1)
src/imports/Ubuntu/AddressBook/ContactView/ContactDetailOnlineAccountsView.qml (+1/-1)
src/imports/Ubuntu/AddressBook/ContactView/ContactDetailPhoneNumbersView.qml (+1/-1)
src/imports/Ubuntu/AddressBook/ContactView/ContactDetailSyncTargetView.qml (+1/-1)
src/imports/Ubuntu/AddressBook/ContactView/ContactDetailWithTypeView.qml (+1/-1)
src/imports/Ubuntu/AddressBook/ContactView/ContactFetchError.qml (+2/-2)
src/imports/Ubuntu/AddressBook/ContactView/ContactHeaderView.qml (+2/-2)
src/imports/Ubuntu/AddressBook/ContactView/ContactViewPage.qml (+2/-2)
src/imports/Ubuntu/Contacts/ActionButton.qml (+1/-1)
src/imports/Ubuntu/Contacts/ContactAvatar.qml (+3/-3)
src/imports/Ubuntu/Contacts/ContactDelegate.qml (+2/-2)
src/imports/Ubuntu/Contacts/ContactDetailPickerPhoneNumberDelegate.qml (+1/-1)
src/imports/Ubuntu/Contacts/ContactListButtonDelegate.qml (+3/-3)
src/imports/Ubuntu/Contacts/ContactListView.qml (+3/-3)
src/imports/Ubuntu/Contacts/ContactSimpleListView.qml (+2/-2)
src/imports/Ubuntu/Contacts/FastScroll.qml (+1/-1)
src/imports/Ubuntu/Contacts/ListItemWithActions.qml (+1/-1)
src/imports/Ubuntu/Contacts/ListItemWithActionsCheckBox.qml (+1/-1)
src/imports/Ubuntu/Contacts/MultipleSelectionListView.qml (+2/-2)
src/imports/Ubuntu/Contacts/OnlineAccountsHelper.qml (+1/-1)
src/imports/Ubuntu/Contacts/PageWithBottomEdge.qml (+2/-2)
src/imports/Ubuntu/Contacts/SIMCardImportPage.qml (+2/-2)
src/imports/Ubuntu/Contacts/SectionDelegate.qml (+2/-2)
src/imports/Ubuntu/Contacts/SubtitledWithColors.qml (+1/-1)
src/imports/VCardImportDialog.qml (+2/-2)
tests/autopilot/address_book_app/__init__.py (+3/-1)
tests/qml/tst_ContactEditor.qml (+4/-4)
tests/qml/tst_ContactList.qml (+1/-1)
tests/qml/tst_ContactListModel.qml (+1/-1)
tests/qml/tst_ContactListView.qml (+1/-1)
tests/qml/tst_ContactPreviewPage.qml (+1/-1)
tests/qml/tst_ListWithActions.qml (+1/-1)
To merge this branch: bzr merge lp:~fboucault/address-book-app/toolkit13
Reviewer Review Type Date Requested Status
Victor Thompson (community) Needs Information on 2015-10-25
Renato Araujo Oliveira Filho (community) 2015-09-04 Approve on 2015-10-23
PS Jenkins bot continuous-integration Needs Fixing on 2015-10-16
Florian Boucault (community) Needs Fixing on 2015-09-03
Review via email: mp+270111@code.launchpad.net

Commit message

Upgraded all imports of toolkit to version 1.3.
Removed use of former MainView.useDeprecatedToolbar property.
Fixed deprecation warnings related to UbuntuShape in toolkit 1.3.

Description of the change

To post a comment you must log in.
Florian Boucault (fboucault) wrote :

Caveat: ContentPeerPicker with Toolkit 1.3 shows a double header.

review: Needs Fixing
470. By Florian Boucault on 2015-09-04

Fixed QML test ContactEditor: header buttons objectNames have changed.

471. By Florian Boucault on 2015-09-04

Fix AP tests

472. By Florian Boucault on 2015-10-16

Merged with trunk

Looks good.

review: Approve
Victor Thompson (vthompson) wrote :

Should this also be updated to use QtQuick 2.4, as that is what the SDK uses?

review: Needs Information

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/imports/ABContactEditorPage.qml'
2--- src/imports/ABContactEditorPage.qml 2015-08-17 18:47:15 +0000
3+++ src/imports/ABContactEditorPage.qml 2015-10-16 13:35:13 +0000
4@@ -17,7 +17,7 @@
5 import QtQuick 2.2
6 import QtContacts 5.0
7
8-import Ubuntu.Components 1.2
9+import Ubuntu.Components 1.3
10
11 import Ubuntu.AddressBook.ContactEditor 0.1
12
13
14=== modified file 'src/imports/ABContactListPage.qml'
15--- src/imports/ABContactListPage.qml 2015-09-16 01:08:07 +0000
16+++ src/imports/ABContactListPage.qml 2015-10-16 13:35:13 +0000
17@@ -17,9 +17,9 @@
18 import QtQuick 2.2
19 import QtContacts 5.0
20
21-import Ubuntu.Components 1.2
22-import Ubuntu.Components.ListItems 1.0 as ListItem
23-import Ubuntu.Components.Popups 1.0 as Popups
24+import Ubuntu.Components 1.3
25+import Ubuntu.Components.ListItems 1.3 as ListItem
26+import Ubuntu.Components.Popups 1.3 as Popups
27 import Ubuntu.Contacts 0.1 as ContactsUI
28 import Ubuntu.Content 1.1 as ContentHub
29
30
31=== modified file 'src/imports/ABContactViewPage.qml'
32--- src/imports/ABContactViewPage.qml 2015-08-17 18:47:15 +0000
33+++ src/imports/ABContactViewPage.qml 2015-10-16 13:35:13 +0000
34@@ -15,8 +15,8 @@
35 */
36
37 import QtQuick 2.2
38-import Ubuntu.Components 1.2
39-import Ubuntu.Components.Popups 1.0 as Popups
40+import Ubuntu.Components 1.3
41+import Ubuntu.Components.Popups 1.3 as Popups
42 import Ubuntu.Contacts 0.1
43
44 import Ubuntu.AddressBook.Base 0.1
45
46=== modified file 'src/imports/MainWindow.qml'
47--- src/imports/MainWindow.qml 2015-08-18 12:56:06 +0000
48+++ src/imports/MainWindow.qml 2015-10-16 13:35:13 +0000
49@@ -15,8 +15,8 @@
50 */
51
52 import QtQuick 2.2
53-import Ubuntu.Components 1.2
54-import Ubuntu.Components.Popups 1.0 as Popups
55+import Ubuntu.Components 1.3
56+import Ubuntu.Components.Popups 1.3 as Popups
57
58 MainView {
59 id: mainWindow
60
61=== modified file 'src/imports/Settings/SettingsPage.qml'
62--- src/imports/Settings/SettingsPage.qml 2015-08-17 18:47:15 +0000
63+++ src/imports/Settings/SettingsPage.qml 2015-10-16 13:35:13 +0000
64@@ -17,8 +17,8 @@
65 import QtQuick 2.2
66 import QtContacts 5.0
67
68-import Ubuntu.Components 1.2
69-import Ubuntu.Components.ListItems 1.0 as ListItem
70+import Ubuntu.Components 1.3
71+import Ubuntu.Components.ListItems 1.3 as ListItem
72 import Ubuntu.Contacts 0.1 as ContactsUI
73
74 Page {
75
76=== modified file 'src/imports/Ubuntu/AddressBook/Base/ContactDetailBase.qml'
77--- src/imports/Ubuntu/AddressBook/Base/ContactDetailBase.qml 2015-05-14 18:12:33 +0000
78+++ src/imports/Ubuntu/AddressBook/Base/ContactDetailBase.qml 2015-10-16 13:35:13 +0000
79@@ -16,7 +16,7 @@
80
81 import QtQuick 2.2
82 import QtContacts 5.0 as QtContacts
83-import Ubuntu.Components.ListItems 1.0 as ListItem
84+import Ubuntu.Components.ListItems 1.3 as ListItem
85
86 ListItem.Empty {
87 id: root
88
89=== modified file 'src/imports/Ubuntu/AddressBook/Base/ContactDetailItem.qml'
90--- src/imports/Ubuntu/AddressBook/Base/ContactDetailItem.qml 2015-08-17 18:47:15 +0000
91+++ src/imports/Ubuntu/AddressBook/Base/ContactDetailItem.qml 2015-10-16 13:35:13 +0000
92@@ -16,7 +16,7 @@
93
94 import QtQuick 2.2
95
96-import Ubuntu.Components 1.2
97+import Ubuntu.Components 1.3
98 import Ubuntu.Contacts 0.1
99
100 ContactDetailBase {
101
102=== modified file 'src/imports/Ubuntu/AddressBook/Base/ContactExporter.qml'
103--- src/imports/Ubuntu/AddressBook/Base/ContactExporter.qml 2015-08-17 18:47:15 +0000
104+++ src/imports/Ubuntu/AddressBook/Base/ContactExporter.qml 2015-10-16 13:35:13 +0000
105@@ -17,9 +17,9 @@
106 import QtQuick 2.2
107 import QtContacts 5.0
108
109-import Ubuntu.Components 1.2
110+import Ubuntu.Components 1.3
111 import Ubuntu.Content 1.1
112-import Ubuntu.Components.Popups 1.0
113+import Ubuntu.Components.Popups 1.3
114
115 Item {
116 id: root
117
118=== modified file 'src/imports/Ubuntu/AddressBook/Base/RemoveContactsDialog.qml'
119--- src/imports/Ubuntu/AddressBook/Base/RemoveContactsDialog.qml 2015-08-17 18:47:15 +0000
120+++ src/imports/Ubuntu/AddressBook/Base/RemoveContactsDialog.qml 2015-10-16 13:35:13 +0000
121@@ -15,8 +15,8 @@
122 */
123
124 import QtQuick 2.2
125-import Ubuntu.Components 1.2
126-import Ubuntu.Components.Popups 1.0
127+import Ubuntu.Components 1.3
128+import Ubuntu.Components.Popups 1.3
129
130 Dialog {
131 objectName: "removeContactsDialog"
132
133=== modified file 'src/imports/Ubuntu/AddressBook/ContactEditor/AvatarImport.qml'
134--- src/imports/Ubuntu/AddressBook/ContactEditor/AvatarImport.qml 2015-08-17 18:47:15 +0000
135+++ src/imports/Ubuntu/AddressBook/ContactEditor/AvatarImport.qml 2015-10-16 13:35:13 +0000
136@@ -16,8 +16,8 @@
137
138 import QtQuick 2.2
139
140-import Ubuntu.Components 1.2
141-import Ubuntu.Components.Popups 1.0
142+import Ubuntu.Components 1.3
143+import Ubuntu.Components.Popups 1.3
144 import Ubuntu.Content 0.1
145
146 Item {
147
148=== modified file 'src/imports/Ubuntu/AddressBook/ContactEditor/ComboButtonAddField.qml'
149--- src/imports/Ubuntu/AddressBook/ContactEditor/ComboButtonAddField.qml 2015-08-17 18:47:15 +0000
150+++ src/imports/Ubuntu/AddressBook/ContactEditor/ComboButtonAddField.qml 2015-10-16 13:35:13 +0000
151@@ -17,8 +17,8 @@
152 import QtQuick 2.2
153 import QtContacts 5.0
154
155-import Ubuntu.Components 1.2
156-import Ubuntu.Components.ListItems 1.0
157+import Ubuntu.Components 1.3
158+import Ubuntu.Components.ListItems 1.3
159
160 ComboButton {
161 id: root
162
163=== modified file 'src/imports/Ubuntu/AddressBook/ContactEditor/ContactDetailAvatarEditor.qml'
164--- src/imports/Ubuntu/AddressBook/ContactEditor/ContactDetailAvatarEditor.qml 2015-08-17 18:47:15 +0000
165+++ src/imports/Ubuntu/AddressBook/ContactEditor/ContactDetailAvatarEditor.qml 2015-10-16 13:35:13 +0000
166@@ -17,7 +17,7 @@
167 import QtQuick 2.2
168 import QtContacts 5.0
169
170-import Ubuntu.Components 1.2
171+import Ubuntu.Components 1.3
172
173 import Ubuntu.Contacts 0.1
174 import Ubuntu.AddressBook.Base 0.1
175@@ -72,7 +72,7 @@
176
177 radius: "medium"
178 anchors.fill: parent
179- image: avatarImage.source != defaultAvatar ? avatarImage : null
180+ source: avatarImage.source != defaultAvatar ? avatarImage : null
181
182 Image {
183 id: avatarImage
184
185=== modified file 'src/imports/Ubuntu/AddressBook/ContactEditor/ContactDetailGroupWithTypeEditor.qml'
186--- src/imports/Ubuntu/AddressBook/ContactEditor/ContactDetailGroupWithTypeEditor.qml 2015-08-17 18:47:15 +0000
187+++ src/imports/Ubuntu/AddressBook/ContactEditor/ContactDetailGroupWithTypeEditor.qml 2015-10-16 13:35:13 +0000
188@@ -17,8 +17,8 @@
189 import QtQuick 2.2
190 import QtContacts 5.0
191
192-import Ubuntu.Components 1.2
193-import Ubuntu.Components.ListItems 1.0
194+import Ubuntu.Components 1.3
195+import Ubuntu.Components.ListItems 1.3
196 import Ubuntu.Contacts 0.1
197
198 import Ubuntu.AddressBook.Base 0.1
199
200=== modified file 'src/imports/Ubuntu/AddressBook/ContactEditor/ContactDetailNameEditor.qml'
201--- src/imports/Ubuntu/AddressBook/ContactEditor/ContactDetailNameEditor.qml 2015-08-17 18:47:15 +0000
202+++ src/imports/Ubuntu/AddressBook/ContactEditor/ContactDetailNameEditor.qml 2015-10-16 13:35:13 +0000
203@@ -17,7 +17,7 @@
204 import QtQuick 2.2
205 import QtContacts 5.0
206
207-import Ubuntu.Components 1.2
208+import Ubuntu.Components 1.3
209
210 import Ubuntu.AddressBook.Base 0.1
211
212
213=== modified file 'src/imports/Ubuntu/AddressBook/ContactEditor/ContactDetailSyncTargetEditor.qml'
214--- src/imports/Ubuntu/AddressBook/ContactEditor/ContactDetailSyncTargetEditor.qml 2015-09-30 04:57:26 +0000
215+++ src/imports/Ubuntu/AddressBook/ContactEditor/ContactDetailSyncTargetEditor.qml 2015-10-16 13:35:13 +0000
216@@ -17,8 +17,8 @@
217 import QtQuick 2.2
218 import QtContacts 5.0
219
220-import Ubuntu.Components 1.2
221-import Ubuntu.Components.ListItems 1.0
222+import Ubuntu.Components 1.3
223+import Ubuntu.Components.ListItems 1.3
224
225 import Ubuntu.Contacts 0.1
226 import Ubuntu.AddressBook.Base 0.1
227
228=== modified file 'src/imports/Ubuntu/AddressBook/ContactEditor/ContactDetailWithTypeEditor.qml'
229--- src/imports/Ubuntu/AddressBook/ContactEditor/ContactDetailWithTypeEditor.qml 2015-08-17 18:47:15 +0000
230+++ src/imports/Ubuntu/AddressBook/ContactEditor/ContactDetailWithTypeEditor.qml 2015-10-16 13:35:13 +0000
231@@ -17,7 +17,7 @@
232 import QtQuick 2.2
233 import QtContacts 5.0
234
235-import Ubuntu.Components 1.2
236+import Ubuntu.Components 1.3
237
238 import Ubuntu.Contacts 0.1
239 import Ubuntu.AddressBook.Base 0.1
240
241=== modified file 'src/imports/Ubuntu/AddressBook/ContactEditor/ContactEditorPage.qml'
242--- src/imports/Ubuntu/AddressBook/ContactEditor/ContactEditorPage.qml 2015-09-29 19:03:44 +0000
243+++ src/imports/Ubuntu/AddressBook/ContactEditor/ContactEditorPage.qml 2015-10-16 13:35:13 +0000
244@@ -17,9 +17,9 @@
245 import QtQuick 2.2
246 import QtContacts 5.0
247
248-import Ubuntu.Components 1.2
249-import Ubuntu.Components.ListItems 1.0
250-import Ubuntu.Components.Popups 1.0
251+import Ubuntu.Components 1.3
252+import Ubuntu.Components.ListItems 1.3
253+import Ubuntu.Components.Popups 1.3
254 import Ubuntu.Contacts 0.1 as ContactsUI
255
256 import Ubuntu.AddressBook.Base 0.1
257
258=== modified file 'src/imports/Ubuntu/AddressBook/ContactEditor/TextInputDetail.qml'
259--- src/imports/Ubuntu/AddressBook/ContactEditor/TextInputDetail.qml 2015-08-19 19:40:36 +0000
260+++ src/imports/Ubuntu/AddressBook/ContactEditor/TextInputDetail.qml 2015-10-16 13:35:13 +0000
261@@ -15,7 +15,7 @@
262 */
263
264 import QtQuick 2.2
265-import Ubuntu.Components 1.2
266+import Ubuntu.Components 1.3
267 import Ubuntu.Keyboard 0.1
268 import Ubuntu.Telephony.PhoneNumber 0.1
269
270
271=== modified file 'src/imports/Ubuntu/AddressBook/ContactEditor/ValueSelector.qml'
272--- src/imports/Ubuntu/AddressBook/ContactEditor/ValueSelector.qml 2015-08-17 18:47:15 +0000
273+++ src/imports/Ubuntu/AddressBook/ContactEditor/ValueSelector.qml 2015-10-16 13:35:13 +0000
274@@ -15,7 +15,7 @@
275 */
276
277 import QtQuick 2.2
278-import Ubuntu.Components 1.2
279+import Ubuntu.Components 1.3
280
281 Item {
282 id: root
283
284=== modified file 'src/imports/Ubuntu/AddressBook/ContactShare/ContactSharePage.qml'
285--- src/imports/Ubuntu/AddressBook/ContactShare/ContactSharePage.qml 2015-08-17 18:47:15 +0000
286+++ src/imports/Ubuntu/AddressBook/ContactShare/ContactSharePage.qml 2015-10-16 13:35:13 +0000
287@@ -17,7 +17,7 @@
288 import QtQuick 2.2
289 import QtContacts 5.0
290
291-import Ubuntu.Components 1.2
292+import Ubuntu.Components 1.3
293 import Ubuntu.Content 1.1 as ContentHub
294
295 import Ubuntu.AddressBook.Base 0.1
296
297=== modified file 'src/imports/Ubuntu/AddressBook/ContactView/ActionButton.qml'
298--- src/imports/Ubuntu/AddressBook/ContactView/ActionButton.qml 2015-08-17 18:47:15 +0000
299+++ src/imports/Ubuntu/AddressBook/ContactView/ActionButton.qml 2015-10-16 13:35:13 +0000
300@@ -15,7 +15,7 @@
301 */
302
303 import QtQuick 2.2
304-import Ubuntu.Components 1.2
305+import Ubuntu.Components 1.3
306
307 AbstractButton {
308 id: root
309
310=== modified file 'src/imports/Ubuntu/AddressBook/ContactView/BasicFieldView.qml'
311--- src/imports/Ubuntu/AddressBook/ContactView/BasicFieldView.qml 2015-08-17 18:47:15 +0000
312+++ src/imports/Ubuntu/AddressBook/ContactView/BasicFieldView.qml 2015-10-16 13:35:13 +0000
313@@ -15,7 +15,7 @@
314 */
315
316 import QtQuick 2.2
317-import Ubuntu.Components 1.2
318+import Ubuntu.Components 1.3
319
320 Item {
321 id: root
322
323=== modified file 'src/imports/Ubuntu/AddressBook/ContactView/ContactDetailAddressesView.qml'
324--- src/imports/Ubuntu/AddressBook/ContactView/ContactDetailAddressesView.qml 2015-08-17 18:47:15 +0000
325+++ src/imports/Ubuntu/AddressBook/ContactView/ContactDetailAddressesView.qml 2015-10-16 13:35:13 +0000
326@@ -16,7 +16,7 @@
327
328 import QtQuick 2.2
329 import QtContacts 5.0 as QtContacts
330-import Ubuntu.Components 1.2
331+import Ubuntu.Components 1.3
332
333 ContactDetailGroupWithTypeView {
334 id: root
335
336=== modified file 'src/imports/Ubuntu/AddressBook/ContactView/ContactDetailAvatarView.qml'
337--- src/imports/Ubuntu/AddressBook/ContactView/ContactDetailAvatarView.qml 2015-08-17 18:47:15 +0000
338+++ src/imports/Ubuntu/AddressBook/ContactView/ContactDetailAvatarView.qml 2015-10-16 13:35:13 +0000
339@@ -17,7 +17,7 @@
340 import QtQuick 2.2
341 import QtGraphicalEffects 1.0
342 import QtContacts 5.0
343-import Ubuntu.Components 1.2
344+import Ubuntu.Components 1.3
345
346 import Ubuntu.Contacts 0.1
347 import Ubuntu.AddressBook.Base 0.1
348
349=== modified file 'src/imports/Ubuntu/AddressBook/ContactView/ContactDetailEmailsView.qml'
350--- src/imports/Ubuntu/AddressBook/ContactView/ContactDetailEmailsView.qml 2015-08-17 18:47:15 +0000
351+++ src/imports/Ubuntu/AddressBook/ContactView/ContactDetailEmailsView.qml 2015-10-16 13:35:13 +0000
352@@ -16,7 +16,7 @@
353
354 import QtQuick 2.2
355 import QtContacts 5.0 as QtContacts
356-import Ubuntu.Components 1.2
357+import Ubuntu.Components 1.3
358
359 ContactDetailGroupWithTypeView {
360 id: root
361
362=== modified file 'src/imports/Ubuntu/AddressBook/ContactView/ContactDetailGroupWithTypeView.qml'
363--- src/imports/Ubuntu/AddressBook/ContactView/ContactDetailGroupWithTypeView.qml 2015-08-17 18:47:15 +0000
364+++ src/imports/Ubuntu/AddressBook/ContactView/ContactDetailGroupWithTypeView.qml 2015-10-16 13:35:13 +0000
365@@ -17,8 +17,8 @@
366 import QtQuick 2.2
367 import QtContacts 5.0 as QtContacts
368
369-import Ubuntu.Components 1.2
370-import Ubuntu.Components.ListItems 1.0 as ListItem
371+import Ubuntu.Components 1.3
372+import Ubuntu.Components.ListItems 1.3 as ListItem
373
374 import Ubuntu.AddressBook.Base 0.1
375
376
377=== modified file 'src/imports/Ubuntu/AddressBook/ContactView/ContactDetailNameView.qml'
378--- src/imports/Ubuntu/AddressBook/ContactView/ContactDetailNameView.qml 2015-08-17 18:47:15 +0000
379+++ src/imports/Ubuntu/AddressBook/ContactView/ContactDetailNameView.qml 2015-10-16 13:35:13 +0000
380@@ -15,7 +15,7 @@
381 */
382
383 import QtQuick 2.2
384-import Ubuntu.Components 1.2
385+import Ubuntu.Components 1.3
386 import QtContacts 5.0
387
388 import Ubuntu.AddressBook.Base 0.1
389
390=== modified file 'src/imports/Ubuntu/AddressBook/ContactView/ContactDetailOnlineAccountsView.qml'
391--- src/imports/Ubuntu/AddressBook/ContactView/ContactDetailOnlineAccountsView.qml 2015-08-17 18:47:15 +0000
392+++ src/imports/Ubuntu/AddressBook/ContactView/ContactDetailOnlineAccountsView.qml 2015-10-16 13:35:13 +0000
393@@ -17,7 +17,7 @@
394 import QtQuick 2.2
395 import QtContacts 5.0 as QtContacts
396
397-import Ubuntu.Components 1.2
398+import Ubuntu.Components 1.3
399 import Ubuntu.Contacts 0.1
400
401 ContactDetailGroupWithTypeView {
402
403=== modified file 'src/imports/Ubuntu/AddressBook/ContactView/ContactDetailPhoneNumbersView.qml'
404--- src/imports/Ubuntu/AddressBook/ContactView/ContactDetailPhoneNumbersView.qml 2015-08-17 18:47:15 +0000
405+++ src/imports/Ubuntu/AddressBook/ContactView/ContactDetailPhoneNumbersView.qml 2015-10-16 13:35:13 +0000
406@@ -18,7 +18,7 @@
407 import QtContacts 5.0 as QtContacts
408
409 import Ubuntu.Contacts 0.1
410-import Ubuntu.Components 1.2
411+import Ubuntu.Components 1.3
412
413 ContactDetailGroupWithTypeView {
414 id: root
415
416=== modified file 'src/imports/Ubuntu/AddressBook/ContactView/ContactDetailSyncTargetView.qml'
417--- src/imports/Ubuntu/AddressBook/ContactView/ContactDetailSyncTargetView.qml 2015-08-17 18:47:15 +0000
418+++ src/imports/Ubuntu/AddressBook/ContactView/ContactDetailSyncTargetView.qml 2015-10-16 13:35:13 +0000
419@@ -15,7 +15,7 @@
420 */
421
422 import QtQuick 2.2
423-import Ubuntu.Components 1.2
424+import Ubuntu.Components 1.3
425 import QtContacts 5.0
426 import Ubuntu.Contacts 0.1
427
428
429=== modified file 'src/imports/Ubuntu/AddressBook/ContactView/ContactDetailWithTypeView.qml'
430--- src/imports/Ubuntu/AddressBook/ContactView/ContactDetailWithTypeView.qml 2015-08-17 18:47:15 +0000
431+++ src/imports/Ubuntu/AddressBook/ContactView/ContactDetailWithTypeView.qml 2015-10-16 13:35:13 +0000
432@@ -17,7 +17,7 @@
433 import QtQuick 2.2
434 import QtContacts 5.0
435
436-import Ubuntu.Components 1.2
437+import Ubuntu.Components 1.3
438 import Ubuntu.AddressBook.Base 0.1
439
440 ContactDetailBase {
441
442=== modified file 'src/imports/Ubuntu/AddressBook/ContactView/ContactFetchError.qml'
443--- src/imports/Ubuntu/AddressBook/ContactView/ContactFetchError.qml 2015-08-17 18:47:15 +0000
444+++ src/imports/Ubuntu/AddressBook/ContactView/ContactFetchError.qml 2015-10-16 13:35:13 +0000
445@@ -15,8 +15,8 @@
446 */
447
448 import QtQuick 2.2
449-import Ubuntu.Components 1.2
450-import Ubuntu.Components.Popups 1.0
451+import Ubuntu.Components 1.3
452+import Ubuntu.Components.Popups 1.3
453
454 Component {
455 Dialog {
456
457=== modified file 'src/imports/Ubuntu/AddressBook/ContactView/ContactHeaderView.qml'
458--- src/imports/Ubuntu/AddressBook/ContactView/ContactHeaderView.qml 2014-07-20 20:23:20 +0000
459+++ src/imports/Ubuntu/AddressBook/ContactView/ContactHeaderView.qml 2015-10-16 13:35:13 +0000
460@@ -15,8 +15,8 @@
461 */
462
463 import QtQuick 2.2
464-import Ubuntu.Components 1.1
465-import Ubuntu.Components.ListItems 1.0 as ListItem
466+import Ubuntu.Components 1.3
467+import Ubuntu.Components.ListItems 1.3 as ListItem
468
469 FocusScope {
470 id: contactHeader
471
472=== modified file 'src/imports/Ubuntu/AddressBook/ContactView/ContactViewPage.qml'
473--- src/imports/Ubuntu/AddressBook/ContactView/ContactViewPage.qml 2015-08-17 18:47:15 +0000
474+++ src/imports/Ubuntu/AddressBook/ContactView/ContactViewPage.qml 2015-10-16 13:35:13 +0000
475@@ -17,8 +17,8 @@
476 import QtQuick 2.2
477 import QtContacts 5.0
478
479-import Ubuntu.Components 1.2
480-import Ubuntu.Components.Popups 1.0
481+import Ubuntu.Components 1.3
482+import Ubuntu.Components.Popups 1.3
483 import Ubuntu.Contacts 0.1
484
485 Page {
486
487=== modified file 'src/imports/Ubuntu/Contacts/ActionButton.qml'
488--- src/imports/Ubuntu/Contacts/ActionButton.qml 2015-08-17 18:47:15 +0000
489+++ src/imports/Ubuntu/Contacts/ActionButton.qml 2015-10-16 13:35:13 +0000
490@@ -15,7 +15,7 @@
491 */
492
493 import QtQuick 2.2
494-import Ubuntu.Components 1.2
495+import Ubuntu.Components 1.3
496
497 AbstractButton {
498 id: root
499
500=== modified file 'src/imports/Ubuntu/Contacts/ContactAvatar.qml'
501--- src/imports/Ubuntu/Contacts/ContactAvatar.qml 2015-08-17 18:47:15 +0000
502+++ src/imports/Ubuntu/Contacts/ContactAvatar.qml 2015-10-16 13:35:13 +0000
503@@ -16,7 +16,7 @@
504
505 import QtQuick 2.2
506 import QtContacts 5.0
507-import Ubuntu.Components 1.2
508+import Ubuntu.Components 1.3
509 import Ubuntu.Contacts 0.1
510 import "Contacts.js" as ContactsJS
511
512@@ -41,7 +41,7 @@
513 }
514
515 radius: "medium"
516- color: Theme.palette.normal.overlay
517+ backgroundColor: Theme.palette.normal.overlay
518
519 Label {
520 id: initialsLabel
521@@ -56,7 +56,7 @@
522 visible: (img.status != Image.Ready)
523 }
524
525- image: !img.visible ? img : null
526+ source: !img.visible ? img : null
527
528 Image {
529 id: img
530
531=== modified file 'src/imports/Ubuntu/Contacts/ContactDelegate.qml'
532--- src/imports/Ubuntu/Contacts/ContactDelegate.qml 2015-08-17 18:47:15 +0000
533+++ src/imports/Ubuntu/Contacts/ContactDelegate.qml 2015-10-16 13:35:13 +0000
534@@ -16,8 +16,8 @@
535
536 import QtQuick 2.2
537 import QtContacts 5.0
538-import Ubuntu.Components 1.2
539-import Ubuntu.Components.ListItems 1.0 as ListItem
540+import Ubuntu.Components 1.3
541+import Ubuntu.Components.ListItems 1.3 as ListItem
542 import "Contacts.js" as ContactsJS
543
544 ListItemWithActions {
545
546=== modified file 'src/imports/Ubuntu/Contacts/ContactDetailPickerPhoneNumberDelegate.qml'
547--- src/imports/Ubuntu/Contacts/ContactDetailPickerPhoneNumberDelegate.qml 2015-08-17 18:47:15 +0000
548+++ src/imports/Ubuntu/Contacts/ContactDetailPickerPhoneNumberDelegate.qml 2015-10-16 13:35:13 +0000
549@@ -15,7 +15,7 @@
550 */
551
552 import QtQuick 2.2
553-import Ubuntu.Components 1.2
554+import Ubuntu.Components 1.3
555 import QtContacts 5.0 as QtContacts
556
557 Item {
558
559=== modified file 'src/imports/Ubuntu/Contacts/ContactListButtonDelegate.qml'
560--- src/imports/Ubuntu/Contacts/ContactListButtonDelegate.qml 2015-08-17 18:47:15 +0000
561+++ src/imports/Ubuntu/Contacts/ContactListButtonDelegate.qml 2015-10-16 13:35:13 +0000
562@@ -15,7 +15,7 @@
563 */
564
565 import QtQuick 2.0
566-import Ubuntu.Components 1.2
567+import Ubuntu.Components 1.3
568
569 Item {
570 id: root
571@@ -49,8 +49,8 @@
572 }
573 width: height
574 radius: "medium"
575- color: Theme.palette.normal.overlay
576- image: Image {
577+ backgroundColor: Theme.palette.normal.overlay
578+ source: Image {
579 source: root.expandIcon ? root.iconSource : ""
580 }
581 Image {
582
583=== modified file 'src/imports/Ubuntu/Contacts/ContactListView.qml'
584--- src/imports/Ubuntu/Contacts/ContactListView.qml 2015-09-18 13:18:40 +0000
585+++ src/imports/Ubuntu/Contacts/ContactListView.qml 2015-10-16 13:35:13 +0000
586@@ -17,9 +17,9 @@
587 import QtQuick 2.2
588 import QtContacts 5.0
589
590-import Ubuntu.Components 1.2
591-import Ubuntu.Components.ListItems 1.0 as ListItem
592-import Ubuntu.Components.Popups 1.0
593+import Ubuntu.Components 1.3
594+import Ubuntu.Components.ListItems 1.3 as ListItem
595+import Ubuntu.Components.Popups 1.3
596 import Ubuntu.Contacts 0.1 as Contacts
597 import Buteo 0.1
598
599
600=== modified file 'src/imports/Ubuntu/Contacts/ContactSimpleListView.qml'
601--- src/imports/Ubuntu/Contacts/ContactSimpleListView.qml 2015-08-17 18:47:15 +0000
602+++ src/imports/Ubuntu/Contacts/ContactSimpleListView.qml 2015-10-16 13:35:13 +0000
603@@ -16,8 +16,8 @@
604
605 import QtQuick 2.2
606 import QtContacts 5.0
607-import Ubuntu.Components 1.2
608-import Ubuntu.Components.ListItems 1.0 as ListItem
609+import Ubuntu.Components 1.3
610+import Ubuntu.Components.ListItems 1.3 as ListItem
611
612 import "ContactList.js" as Sections
613
614
615=== modified file 'src/imports/Ubuntu/Contacts/FastScroll.qml'
616--- src/imports/Ubuntu/Contacts/FastScroll.qml 2015-08-17 18:47:15 +0000
617+++ src/imports/Ubuntu/Contacts/FastScroll.qml 2015-10-16 13:35:13 +0000
618@@ -41,7 +41,7 @@
619
620 // FastScroll.qml
621 import QtQuick 2.2
622-import Ubuntu.Components 1.2
623+import Ubuntu.Components 1.3
624 import "FastScroll.js" as Sections
625
626 Item {
627
628=== modified file 'src/imports/Ubuntu/Contacts/ListItemWithActions.qml'
629--- src/imports/Ubuntu/Contacts/ListItemWithActions.qml 2015-08-17 18:47:15 +0000
630+++ src/imports/Ubuntu/Contacts/ListItemWithActions.qml 2015-10-16 13:35:13 +0000
631@@ -15,7 +15,7 @@
632 */
633
634 import QtQuick 2.2
635-import Ubuntu.Components 1.2
636+import Ubuntu.Components 1.3
637
638 Item {
639 id: root
640
641=== modified file 'src/imports/Ubuntu/Contacts/ListItemWithActionsCheckBox.qml'
642--- src/imports/Ubuntu/Contacts/ListItemWithActionsCheckBox.qml 2015-08-17 18:47:15 +0000
643+++ src/imports/Ubuntu/Contacts/ListItemWithActionsCheckBox.qml 2015-10-16 13:35:13 +0000
644@@ -15,7 +15,7 @@
645 */
646
647 import QtQuick 2.2
648-import Ubuntu.Components 1.2
649+import Ubuntu.Components 1.3
650
651 CheckBox {
652 checked: root.selected
653
654=== modified file 'src/imports/Ubuntu/Contacts/MultipleSelectionListView.qml'
655--- src/imports/Ubuntu/Contacts/MultipleSelectionListView.qml 2015-08-17 18:47:15 +0000
656+++ src/imports/Ubuntu/Contacts/MultipleSelectionListView.qml 2015-10-16 13:35:13 +0000
657@@ -15,8 +15,8 @@
658 */
659
660 import QtQuick 2.2
661-import Ubuntu.Components 1.2
662-import Ubuntu.Components.Popups 1.0 as Popups
663+import Ubuntu.Components 1.3
664+import Ubuntu.Components.Popups 1.3 as Popups
665
666 /*!
667 \qmltype ContactSimpleListView
668
669=== modified file 'src/imports/Ubuntu/Contacts/OnlineAccountsHelper.qml'
670--- src/imports/Ubuntu/Contacts/OnlineAccountsHelper.qml 2015-08-17 18:47:15 +0000
671+++ src/imports/Ubuntu/Contacts/OnlineAccountsHelper.qml 2015-10-16 13:35:13 +0000
672@@ -15,7 +15,7 @@
673 */
674
675 import QtQuick 2.2
676-import Ubuntu.Components 1.2
677+import Ubuntu.Components 1.3
678 import Ubuntu.OnlineAccounts 0.1
679 import Ubuntu.OnlineAccounts.Client 0.1
680
681
682=== modified file 'src/imports/Ubuntu/Contacts/PageWithBottomEdge.qml'
683--- src/imports/Ubuntu/Contacts/PageWithBottomEdge.qml 2015-08-17 18:47:15 +0000
684+++ src/imports/Ubuntu/Contacts/PageWithBottomEdge.qml 2015-10-16 13:35:13 +0000
685@@ -63,7 +63,7 @@
686 */
687
688 import QtQuick 2.2
689-import Ubuntu.Components 1.2
690+import Ubuntu.Components 1.3
691
692 Page {
693 id: page
694@@ -170,7 +170,7 @@
695 z: 1
696 width: tipLabel.paintedWidth + units.gu(6)
697 height: bottomEdge.tipHeight + units.gu(1)
698- color: Theme.palette.normal.overlay
699+ backgroundColor: Theme.palette.normal.overlay
700 Label {
701 id: tipLabel
702
703
704=== modified file 'src/imports/Ubuntu/Contacts/SIMCardImportPage.qml'
705--- src/imports/Ubuntu/Contacts/SIMCardImportPage.qml 2015-08-17 18:47:15 +0000
706+++ src/imports/Ubuntu/Contacts/SIMCardImportPage.qml 2015-10-16 13:35:13 +0000
707@@ -17,9 +17,9 @@
708 import QtQuick 2.2
709 import QtContacts 5.0
710
711-import Ubuntu.Components 1.2
712+import Ubuntu.Components 1.3
713 import Ubuntu.Contacts 0.1
714-import Ubuntu.Components.ListItems 1.0 as ListItem
715+import Ubuntu.Components.ListItems 1.3 as ListItem
716
717 import MeeGo.QOfono 0.2
718
719
720=== modified file 'src/imports/Ubuntu/Contacts/SectionDelegate.qml'
721--- src/imports/Ubuntu/Contacts/SectionDelegate.qml 2015-08-17 18:47:15 +0000
722+++ src/imports/Ubuntu/Contacts/SectionDelegate.qml 2015-10-16 13:35:13 +0000
723@@ -15,8 +15,8 @@
724 */
725
726 import QtQuick 2.2
727-import Ubuntu.Components 1.2
728-import Ubuntu.Components.ListItems 1.0
729+import Ubuntu.Components 1.3
730+import Ubuntu.Components.ListItems 1.3
731
732 Rectangle {
733 property alias text: title.text
734
735=== modified file 'src/imports/Ubuntu/Contacts/SubtitledWithColors.qml'
736--- src/imports/Ubuntu/Contacts/SubtitledWithColors.qml 2015-08-17 18:47:15 +0000
737+++ src/imports/Ubuntu/Contacts/SubtitledWithColors.qml 2015-10-16 13:35:13 +0000
738@@ -15,7 +15,7 @@
739 */
740
741 import QtQuick 2.0
742-import Ubuntu.Components 1.2
743+import Ubuntu.Components 1.3
744
745 MouseArea {
746 id: subtitledListItem
747
748=== modified file 'src/imports/VCardImportDialog.qml'
749--- src/imports/VCardImportDialog.qml 2015-08-17 18:47:15 +0000
750+++ src/imports/VCardImportDialog.qml 2015-10-16 13:35:13 +0000
751@@ -16,8 +16,8 @@
752
753 import QtQuick 2.2
754 import QtContacts 5.0
755-import Ubuntu.Components 1.2
756-import Ubuntu.Components.Popups 1.0 as Popups
757+import Ubuntu.Components 1.3
758+import Ubuntu.Components.Popups 1.3 as Popups
759
760 Item {
761 id: root
762
763=== modified file 'tests/autopilot/address_book_app/__init__.py'
764--- tests/autopilot/address_book_app/__init__.py 2015-06-10 17:25:15 +0000
765+++ tests/autopilot/address_book_app/__init__.py 2015-10-16 13:35:13 +0000
766@@ -124,7 +124,9 @@
767 objectName="contactListView")
768
769 def get_button(self, buttonName):
770- return self.get_header()._get_action_button(buttonName)
771+ actionbar = self.select_single('ActionBar', objectName='headerActionBar')
772+ return actionbar._get_action_button(buttonName)
773+
774
775 def open_header(self):
776 header = self.get_header()
777
778=== modified file 'tests/qml/tst_ContactEditor.qml'
779--- tests/qml/tst_ContactEditor.qml 2015-08-17 18:47:15 +0000
780+++ tests/qml/tst_ContactEditor.qml 2015-10-16 13:35:13 +0000
781@@ -16,7 +16,7 @@
782
783 import QtQuick 2.2
784 import QtTest 1.0
785-import Ubuntu.Components 1.2
786+import Ubuntu.Components 1.3
787 import Ubuntu.Test 0.1
788 import Ubuntu.Contacts 0.1
789
790@@ -69,7 +69,7 @@
791
792 function init() {
793 waitForRendering(contactEditor);
794- var saveButton = findChild(root, 'save_header_button');
795+ var saveButton = findChild(root, 'save_action_button');
796 compare(saveButton.enabled, false);
797 }
798
799@@ -113,7 +113,7 @@
800 function test_fillRequiredFieldsMustEnableSaveButton(data) {
801 var textField = findChild(root, data.objectName);
802 textField.text = 'test'
803- var saveButton = findChild(root, 'save_header_button');
804+ var saveButton = findChild(root, 'save_action_button');
805 tryCompare(saveButton, 'enabled', true);
806 }
807
808@@ -125,7 +125,7 @@
809 function test_fillOptionalFieldsMustNotEnableSaveButton(data) {
810 var textField = findChild(root, data.objectName);
811 textField.text = 'test'
812- var saveButton = findChild(root, 'save_header_button');
813+ var saveButton = findChild(root, 'save_action_button');
814 tryCompare(saveButton, 'enabled', false);
815 }
816
817
818=== modified file 'tests/qml/tst_ContactList.qml'
819--- tests/qml/tst_ContactList.qml 2015-08-17 18:47:15 +0000
820+++ tests/qml/tst_ContactList.qml 2015-10-16 13:35:13 +0000
821@@ -16,7 +16,7 @@
822
823 import QtQuick 2.2
824 import QtTest 1.0
825-import Ubuntu.Components 1.2
826+import Ubuntu.Components 1.3
827 import Ubuntu.Test 0.1
828 import Ubuntu.Contacts 0.1
829
830
831=== modified file 'tests/qml/tst_ContactListModel.qml'
832--- tests/qml/tst_ContactListModel.qml 2015-08-17 18:47:15 +0000
833+++ tests/qml/tst_ContactListModel.qml 2015-10-16 13:35:13 +0000
834@@ -16,7 +16,7 @@
835
836 import QtQuick 2.2
837 import QtTest 1.0
838-import Ubuntu.Components 1.2
839+import Ubuntu.Components 1.3
840 import Ubuntu.Test 0.1
841 import Ubuntu.Contacts 0.1
842
843
844=== modified file 'tests/qml/tst_ContactListView.qml'
845--- tests/qml/tst_ContactListView.qml 2015-08-17 18:47:15 +0000
846+++ tests/qml/tst_ContactListView.qml 2015-10-16 13:35:13 +0000
847@@ -16,7 +16,7 @@
848
849 import QtQuick 2.2
850 import QtTest 1.0
851-import Ubuntu.Components 1.2
852+import Ubuntu.Components 1.3
853 import Ubuntu.Test 0.1
854 import Ubuntu.Contacts 0.1
855
856
857=== modified file 'tests/qml/tst_ContactPreviewPage.qml'
858--- tests/qml/tst_ContactPreviewPage.qml 2015-08-17 18:47:15 +0000
859+++ tests/qml/tst_ContactPreviewPage.qml 2015-10-16 13:35:13 +0000
860@@ -19,7 +19,7 @@
861 import Ubuntu.Test 0.1
862 import QtContacts 5.0
863
864-import Ubuntu.Components 1.2
865+import Ubuntu.Components 1.3
866 import Ubuntu.Contacts 0.1
867 import Ubuntu.AddressBook.ContactView 0.1
868
869
870=== modified file 'tests/qml/tst_ListWithActions.qml'
871--- tests/qml/tst_ListWithActions.qml 2015-08-17 18:47:15 +0000
872+++ tests/qml/tst_ListWithActions.qml 2015-10-16 13:35:13 +0000
873@@ -15,7 +15,7 @@
874 */
875
876 import QtQuick 2.2
877-import Ubuntu.Components 1.2
878+import Ubuntu.Components 1.3
879 import QtTest 1.0
880 import Ubuntu.Test 0.1
881 import Ubuntu.Contacts 0.1

Subscribers

People subscribed via source and target branches