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

[Florian Boucault]

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.

There is another branch to fix all autopilot: https://code.launchpad.net/~renatofilho/address-book-app/autopilot-and-sdk-1.3/+merge/272833

[Florian Boucault (fboucault)]

Caveat: ContentPeerPicker with Toolkit 1.3 shows a double header.

review: Needs Fixing

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:469
http://jenkins.qa.ubuntu.com/job/address-book-app-ci/906/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/address-book-app-vivid-i386-ci/209/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/4009/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4006/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/address-book-app-ci/906/rebuild

review: Needs Fixing (continuous-integration)

[lp:~fboucault/address-book-app/toolkit13]

470. By Florian Boucault on 2015-09-04

Fixed QML test ContactEditor: header buttons objectNames have changed.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:470
http://jenkins.qa.ubuntu.com/job/address-book-app-ci/908/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-app-vivid-i386-ci/211
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/4021
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/3282
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4018
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4018/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/23066

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/address-book-app-ci/908/rebuild

review: Needs Fixing (continuous-integration)

[lp:~fboucault/address-book-app/toolkit13]

471. By Florian Boucault on 2015-09-04

Fix AP tests

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:471
http://jenkins.qa.ubuntu.com/job/address-book-app-ci/910/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-app-vivid-i386-ci/213
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/4026
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/3285
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4023
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4023/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/23070

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/address-book-app-ci/910/rebuild

review: Approve (continuous-integration)

[lp:~fboucault/address-book-app/toolkit13]

472. By Florian Boucault on 2015-10-16

Merged with trunk

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:472
http://jenkins.qa.ubuntu.com/job/address-book-app-ci/960/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-app-vivid-i386-ci/263
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/4682
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/3776
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4679
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4679/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/24288

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/address-book-app-ci/960/rebuild

review: Needs Fixing (continuous-integration)

[Renato Araujo Oliveira Filho (renatofilho)]

Looks good.

review: Approve

[Victor Thompson (vthompson)]

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

review: Needs Information

=== modified file 'src/imports/ABContactEditorPage.qml'
--- src/imports/ABContactEditorPage.qml	2015-08-17 18:47:15 +0000
+++ src/imports/ABContactEditorPage.qml	2015-10-16 13:35:13 +0000
@@ -17,7 +17,7 @@
 import QtQuick 2.2
 import QtContacts 5.0
 
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 
 import Ubuntu.AddressBook.ContactEditor 0.1
 
 
=== modified file 'src/imports/ABContactListPage.qml'
--- src/imports/ABContactListPage.qml	2015-09-16 01:08:07 +0000
+++ src/imports/ABContactListPage.qml	2015-10-16 13:35:13 +0000
@@ -17,9 +17,9 @@
 import QtQuick 2.2
 import QtContacts 5.0
 
-import Ubuntu.Components 1.2
-import Ubuntu.Components.ListItems 1.0 as ListItem
-import Ubuntu.Components.Popups 1.0 as Popups
+import Ubuntu.Components 1.3
+import Ubuntu.Components.ListItems 1.3 as ListItem
+import Ubuntu.Components.Popups 1.3 as Popups
 import Ubuntu.Contacts 0.1 as ContactsUI
 import Ubuntu.Content 1.1 as ContentHub
 
 
=== modified file 'src/imports/ABContactViewPage.qml'
--- src/imports/ABContactViewPage.qml	2015-08-17 18:47:15 +0000
+++ src/imports/ABContactViewPage.qml	2015-10-16 13:35:13 +0000
@@ -15,8 +15,8 @@
  */
 
 import QtQuick 2.2
-import Ubuntu.Components 1.2
-import Ubuntu.Components.Popups 1.0 as Popups
+import Ubuntu.Components 1.3
+import Ubuntu.Components.Popups 1.3 as Popups
 import Ubuntu.Contacts 0.1
 
 import Ubuntu.AddressBook.Base 0.1
 
=== modified file 'src/imports/MainWindow.qml'
--- src/imports/MainWindow.qml	2015-08-18 12:56:06 +0000
+++ src/imports/MainWindow.qml	2015-10-16 13:35:13 +0000
@@ -15,8 +15,8 @@
  */
 
 import QtQuick 2.2
-import Ubuntu.Components 1.2
-import Ubuntu.Components.Popups 1.0 as Popups
+import Ubuntu.Components 1.3
+import Ubuntu.Components.Popups 1.3 as Popups
 
 MainView {
     id: mainWindow
 
=== modified file 'src/imports/Settings/SettingsPage.qml'
--- src/imports/Settings/SettingsPage.qml	2015-08-17 18:47:15 +0000
+++ src/imports/Settings/SettingsPage.qml	2015-10-16 13:35:13 +0000
@@ -17,8 +17,8 @@
 import QtQuick 2.2
 import QtContacts 5.0
 
-import Ubuntu.Components 1.2
-import Ubuntu.Components.ListItems 1.0 as ListItem
+import Ubuntu.Components 1.3
+import Ubuntu.Components.ListItems 1.3 as ListItem
 import Ubuntu.Contacts 0.1 as ContactsUI
 
 Page {
 
=== modified file 'src/imports/Ubuntu/AddressBook/Base/ContactDetailBase.qml'
--- src/imports/Ubuntu/AddressBook/Base/ContactDetailBase.qml	2015-05-14 18:12:33 +0000
+++ src/imports/Ubuntu/AddressBook/Base/ContactDetailBase.qml	2015-10-16 13:35:13 +0000
@@ -16,7 +16,7 @@
 
 import QtQuick 2.2
 import QtContacts 5.0 as QtContacts
-import Ubuntu.Components.ListItems 1.0 as ListItem
+import Ubuntu.Components.ListItems 1.3 as ListItem
 
 ListItem.Empty {
     id: root
 
=== modified file 'src/imports/Ubuntu/AddressBook/Base/ContactDetailItem.qml'
--- src/imports/Ubuntu/AddressBook/Base/ContactDetailItem.qml	2015-08-17 18:47:15 +0000
+++ src/imports/Ubuntu/AddressBook/Base/ContactDetailItem.qml	2015-10-16 13:35:13 +0000
@@ -16,7 +16,7 @@
 
 import QtQuick 2.2
 
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 import Ubuntu.Contacts 0.1
 
 ContactDetailBase {
 
=== modified file 'src/imports/Ubuntu/AddressBook/Base/ContactExporter.qml'
--- src/imports/Ubuntu/AddressBook/Base/ContactExporter.qml	2015-08-17 18:47:15 +0000
+++ src/imports/Ubuntu/AddressBook/Base/ContactExporter.qml	2015-10-16 13:35:13 +0000
@@ -17,9 +17,9 @@
 import QtQuick 2.2
 import QtContacts 5.0
 
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 import Ubuntu.Content 1.1
-import Ubuntu.Components.Popups 1.0
+import Ubuntu.Components.Popups 1.3
 
 Item {
     id: root
 
=== modified file 'src/imports/Ubuntu/AddressBook/Base/RemoveContactsDialog.qml'
--- src/imports/Ubuntu/AddressBook/Base/RemoveContactsDialog.qml	2015-08-17 18:47:15 +0000
+++ src/imports/Ubuntu/AddressBook/Base/RemoveContactsDialog.qml	2015-10-16 13:35:13 +0000
@@ -15,8 +15,8 @@
  */
 
 import QtQuick 2.2
-import Ubuntu.Components 1.2
-import Ubuntu.Components.Popups 1.0
+import Ubuntu.Components 1.3
+import Ubuntu.Components.Popups 1.3
 
 Dialog {
     objectName: "removeContactsDialog"
 
=== modified file 'src/imports/Ubuntu/AddressBook/ContactEditor/AvatarImport.qml'
--- src/imports/Ubuntu/AddressBook/ContactEditor/AvatarImport.qml	2015-08-17 18:47:15 +0000
+++ src/imports/Ubuntu/AddressBook/ContactEditor/AvatarImport.qml	2015-10-16 13:35:13 +0000
@@ -16,8 +16,8 @@
 
 import QtQuick 2.2
 
-import Ubuntu.Components 1.2
-import Ubuntu.Components.Popups 1.0
+import Ubuntu.Components 1.3
+import Ubuntu.Components.Popups 1.3
 import Ubuntu.Content 0.1
 
 Item {
 
=== modified file 'src/imports/Ubuntu/AddressBook/ContactEditor/ComboButtonAddField.qml'
--- src/imports/Ubuntu/AddressBook/ContactEditor/ComboButtonAddField.qml	2015-08-17 18:47:15 +0000
+++ src/imports/Ubuntu/AddressBook/ContactEditor/ComboButtonAddField.qml	2015-10-16 13:35:13 +0000
@@ -17,8 +17,8 @@
 import QtQuick 2.2
 import QtContacts 5.0
 
-import Ubuntu.Components 1.2
-import Ubuntu.Components.ListItems 1.0
+import Ubuntu.Components 1.3
+import Ubuntu.Components.ListItems 1.3
 
 ComboButton {
     id: root
 
=== modified file 'src/imports/Ubuntu/AddressBook/ContactEditor/ContactDetailAvatarEditor.qml'
--- src/imports/Ubuntu/AddressBook/ContactEditor/ContactDetailAvatarEditor.qml	2015-08-17 18:47:15 +0000
+++ src/imports/Ubuntu/AddressBook/ContactEditor/ContactDetailAvatarEditor.qml	2015-10-16 13:35:13 +0000
@@ -17,7 +17,7 @@
 import QtQuick 2.2
 import QtContacts 5.0
 
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 
 import Ubuntu.Contacts 0.1
 import Ubuntu.AddressBook.Base 0.1
@@ -72,7 +72,7 @@
 
         radius: "medium"
         anchors.fill: parent
-        image: avatarImage.source != defaultAvatar ? avatarImage : null
+        source: avatarImage.source != defaultAvatar ? avatarImage : null
 
         Image {
             id: avatarImage
 
=== modified file 'src/imports/Ubuntu/AddressBook/ContactEditor/ContactDetailGroupWithTypeEditor.qml'
--- src/imports/Ubuntu/AddressBook/ContactEditor/ContactDetailGroupWithTypeEditor.qml	2015-08-17 18:47:15 +0000
+++ src/imports/Ubuntu/AddressBook/ContactEditor/ContactDetailGroupWithTypeEditor.qml	2015-10-16 13:35:13 +0000
@@ -17,8 +17,8 @@
 import QtQuick 2.2
 import QtContacts 5.0
 
-import Ubuntu.Components 1.2
-import Ubuntu.Components.ListItems 1.0
+import Ubuntu.Components 1.3
+import Ubuntu.Components.ListItems 1.3
 import Ubuntu.Contacts 0.1
 
 import Ubuntu.AddressBook.Base 0.1
 
=== modified file 'src/imports/Ubuntu/AddressBook/ContactEditor/ContactDetailNameEditor.qml'
--- src/imports/Ubuntu/AddressBook/ContactEditor/ContactDetailNameEditor.qml	2015-08-17 18:47:15 +0000
+++ src/imports/Ubuntu/AddressBook/ContactEditor/ContactDetailNameEditor.qml	2015-10-16 13:35:13 +0000
@@ -17,7 +17,7 @@
 import QtQuick 2.2
 import QtContacts 5.0
 
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 
 import Ubuntu.AddressBook.Base 0.1
 
 
=== modified file 'src/imports/Ubuntu/AddressBook/ContactEditor/ContactDetailSyncTargetEditor.qml'
--- src/imports/Ubuntu/AddressBook/ContactEditor/ContactDetailSyncTargetEditor.qml	2015-09-30 04:57:26 +0000
+++ src/imports/Ubuntu/AddressBook/ContactEditor/ContactDetailSyncTargetEditor.qml	2015-10-16 13:35:13 +0000
@@ -17,8 +17,8 @@
 import QtQuick 2.2
 import QtContacts 5.0
 
-import Ubuntu.Components 1.2
-import Ubuntu.Components.ListItems 1.0
+import Ubuntu.Components 1.3
+import Ubuntu.Components.ListItems 1.3
 
 import Ubuntu.Contacts 0.1
 import Ubuntu.AddressBook.Base 0.1
 
=== modified file 'src/imports/Ubuntu/AddressBook/ContactEditor/ContactDetailWithTypeEditor.qml'
--- src/imports/Ubuntu/AddressBook/ContactEditor/ContactDetailWithTypeEditor.qml	2015-08-17 18:47:15 +0000
+++ src/imports/Ubuntu/AddressBook/ContactEditor/ContactDetailWithTypeEditor.qml	2015-10-16 13:35:13 +0000
@@ -17,7 +17,7 @@
 import QtQuick 2.2
 import QtContacts 5.0
 
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 
 import Ubuntu.Contacts 0.1
 import Ubuntu.AddressBook.Base 0.1
 
=== modified file 'src/imports/Ubuntu/AddressBook/ContactEditor/ContactEditorPage.qml'
--- src/imports/Ubuntu/AddressBook/ContactEditor/ContactEditorPage.qml	2015-09-29 19:03:44 +0000
+++ src/imports/Ubuntu/AddressBook/ContactEditor/ContactEditorPage.qml	2015-10-16 13:35:13 +0000
@@ -17,9 +17,9 @@
 import QtQuick 2.2
 import QtContacts 5.0
 
-import Ubuntu.Components 1.2
-import Ubuntu.Components.ListItems 1.0
-import Ubuntu.Components.Popups 1.0
+import Ubuntu.Components 1.3
+import Ubuntu.Components.ListItems 1.3
+import Ubuntu.Components.Popups 1.3
 import Ubuntu.Contacts 0.1 as ContactsUI
 
 import Ubuntu.AddressBook.Base 0.1
 
=== modified file 'src/imports/Ubuntu/AddressBook/ContactEditor/TextInputDetail.qml'
--- src/imports/Ubuntu/AddressBook/ContactEditor/TextInputDetail.qml	2015-08-19 19:40:36 +0000
+++ src/imports/Ubuntu/AddressBook/ContactEditor/TextInputDetail.qml	2015-10-16 13:35:13 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.2
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 import Ubuntu.Keyboard 0.1
 import Ubuntu.Telephony.PhoneNumber 0.1
 
 
=== modified file 'src/imports/Ubuntu/AddressBook/ContactEditor/ValueSelector.qml'
--- src/imports/Ubuntu/AddressBook/ContactEditor/ValueSelector.qml	2015-08-17 18:47:15 +0000
+++ src/imports/Ubuntu/AddressBook/ContactEditor/ValueSelector.qml	2015-10-16 13:35:13 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.2
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 
 Item {
     id: root
 
=== modified file 'src/imports/Ubuntu/AddressBook/ContactShare/ContactSharePage.qml'
--- src/imports/Ubuntu/AddressBook/ContactShare/ContactSharePage.qml	2015-08-17 18:47:15 +0000
+++ src/imports/Ubuntu/AddressBook/ContactShare/ContactSharePage.qml	2015-10-16 13:35:13 +0000
@@ -17,7 +17,7 @@
 import QtQuick 2.2
 import QtContacts 5.0
 
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 import Ubuntu.Content 1.1 as ContentHub
 
 import Ubuntu.AddressBook.Base 0.1
 
=== modified file 'src/imports/Ubuntu/AddressBook/ContactView/ActionButton.qml'
--- src/imports/Ubuntu/AddressBook/ContactView/ActionButton.qml	2015-08-17 18:47:15 +0000
+++ src/imports/Ubuntu/AddressBook/ContactView/ActionButton.qml	2015-10-16 13:35:13 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.2
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 
 AbstractButton {
     id: root
 
=== modified file 'src/imports/Ubuntu/AddressBook/ContactView/BasicFieldView.qml'
--- src/imports/Ubuntu/AddressBook/ContactView/BasicFieldView.qml	2015-08-17 18:47:15 +0000
+++ src/imports/Ubuntu/AddressBook/ContactView/BasicFieldView.qml	2015-10-16 13:35:13 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.2
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 
  Item {
     id: root
 
=== modified file 'src/imports/Ubuntu/AddressBook/ContactView/ContactDetailAddressesView.qml'
--- src/imports/Ubuntu/AddressBook/ContactView/ContactDetailAddressesView.qml	2015-08-17 18:47:15 +0000
+++ src/imports/Ubuntu/AddressBook/ContactView/ContactDetailAddressesView.qml	2015-10-16 13:35:13 +0000
@@ -16,7 +16,7 @@
 
 import QtQuick 2.2
 import QtContacts 5.0 as QtContacts
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 
 ContactDetailGroupWithTypeView {
     id: root
 
=== modified file 'src/imports/Ubuntu/AddressBook/ContactView/ContactDetailAvatarView.qml'
--- src/imports/Ubuntu/AddressBook/ContactView/ContactDetailAvatarView.qml	2015-08-17 18:47:15 +0000
+++ src/imports/Ubuntu/AddressBook/ContactView/ContactDetailAvatarView.qml	2015-10-16 13:35:13 +0000
@@ -17,7 +17,7 @@
 import QtQuick 2.2
 import QtGraphicalEffects 1.0
 import QtContacts 5.0
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 
 import Ubuntu.Contacts 0.1
 import Ubuntu.AddressBook.Base 0.1
 
=== modified file 'src/imports/Ubuntu/AddressBook/ContactView/ContactDetailEmailsView.qml'
--- src/imports/Ubuntu/AddressBook/ContactView/ContactDetailEmailsView.qml	2015-08-17 18:47:15 +0000
+++ src/imports/Ubuntu/AddressBook/ContactView/ContactDetailEmailsView.qml	2015-10-16 13:35:13 +0000
@@ -16,7 +16,7 @@
 
 import QtQuick 2.2
 import QtContacts 5.0 as QtContacts
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 
 ContactDetailGroupWithTypeView {
     id: root
 
=== modified file 'src/imports/Ubuntu/AddressBook/ContactView/ContactDetailGroupWithTypeView.qml'
--- src/imports/Ubuntu/AddressBook/ContactView/ContactDetailGroupWithTypeView.qml	2015-08-17 18:47:15 +0000
+++ src/imports/Ubuntu/AddressBook/ContactView/ContactDetailGroupWithTypeView.qml	2015-10-16 13:35:13 +0000
@@ -17,8 +17,8 @@
 import QtQuick 2.2
 import QtContacts 5.0 as QtContacts
 
-import Ubuntu.Components 1.2
-import Ubuntu.Components.ListItems 1.0 as ListItem
+import Ubuntu.Components 1.3
+import Ubuntu.Components.ListItems 1.3 as ListItem
 
 import Ubuntu.AddressBook.Base 0.1
 
 
=== modified file 'src/imports/Ubuntu/AddressBook/ContactView/ContactDetailNameView.qml'
--- src/imports/Ubuntu/AddressBook/ContactView/ContactDetailNameView.qml	2015-08-17 18:47:15 +0000
+++ src/imports/Ubuntu/AddressBook/ContactView/ContactDetailNameView.qml	2015-10-16 13:35:13 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.2
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 import QtContacts 5.0
 
 import Ubuntu.AddressBook.Base 0.1
 
=== modified file 'src/imports/Ubuntu/AddressBook/ContactView/ContactDetailOnlineAccountsView.qml'
--- src/imports/Ubuntu/AddressBook/ContactView/ContactDetailOnlineAccountsView.qml	2015-08-17 18:47:15 +0000
+++ src/imports/Ubuntu/AddressBook/ContactView/ContactDetailOnlineAccountsView.qml	2015-10-16 13:35:13 +0000
@@ -17,7 +17,7 @@
 import QtQuick 2.2
 import QtContacts 5.0 as QtContacts
 
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 import Ubuntu.Contacts 0.1
 
 ContactDetailGroupWithTypeView {
 
=== modified file 'src/imports/Ubuntu/AddressBook/ContactView/ContactDetailPhoneNumbersView.qml'
--- src/imports/Ubuntu/AddressBook/ContactView/ContactDetailPhoneNumbersView.qml	2015-08-17 18:47:15 +0000
+++ src/imports/Ubuntu/AddressBook/ContactView/ContactDetailPhoneNumbersView.qml	2015-10-16 13:35:13 +0000
@@ -18,7 +18,7 @@
 import QtContacts 5.0 as QtContacts
 
 import Ubuntu.Contacts 0.1
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 
 ContactDetailGroupWithTypeView {
     id: root
 
=== modified file 'src/imports/Ubuntu/AddressBook/ContactView/ContactDetailSyncTargetView.qml'
--- src/imports/Ubuntu/AddressBook/ContactView/ContactDetailSyncTargetView.qml	2015-08-17 18:47:15 +0000
+++ src/imports/Ubuntu/AddressBook/ContactView/ContactDetailSyncTargetView.qml	2015-10-16 13:35:13 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.2
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 import QtContacts 5.0
 import Ubuntu.Contacts 0.1
 
 
=== modified file 'src/imports/Ubuntu/AddressBook/ContactView/ContactDetailWithTypeView.qml'
--- src/imports/Ubuntu/AddressBook/ContactView/ContactDetailWithTypeView.qml	2015-08-17 18:47:15 +0000
+++ src/imports/Ubuntu/AddressBook/ContactView/ContactDetailWithTypeView.qml	2015-10-16 13:35:13 +0000
@@ -17,7 +17,7 @@
 import QtQuick 2.2
 import QtContacts 5.0
 
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 import Ubuntu.AddressBook.Base 0.1
 
 ContactDetailBase {
 
=== modified file 'src/imports/Ubuntu/AddressBook/ContactView/ContactFetchError.qml'
--- src/imports/Ubuntu/AddressBook/ContactView/ContactFetchError.qml	2015-08-17 18:47:15 +0000
+++ src/imports/Ubuntu/AddressBook/ContactView/ContactFetchError.qml	2015-10-16 13:35:13 +0000
@@ -15,8 +15,8 @@
  */
 
 import QtQuick 2.2
-import Ubuntu.Components 1.2
-import Ubuntu.Components.Popups 1.0
+import Ubuntu.Components 1.3
+import Ubuntu.Components.Popups 1.3
 
 Component {
     Dialog {
 
=== modified file 'src/imports/Ubuntu/AddressBook/ContactView/ContactHeaderView.qml'
--- src/imports/Ubuntu/AddressBook/ContactView/ContactHeaderView.qml	2014-07-20 20:23:20 +0000
+++ src/imports/Ubuntu/AddressBook/ContactView/ContactHeaderView.qml	2015-10-16 13:35:13 +0000
@@ -15,8 +15,8 @@
  */
 
 import QtQuick 2.2
-import Ubuntu.Components 1.1
-import Ubuntu.Components.ListItems 1.0 as ListItem
+import Ubuntu.Components 1.3
+import Ubuntu.Components.ListItems 1.3 as ListItem
 
 FocusScope {
     id: contactHeader
 
=== modified file 'src/imports/Ubuntu/AddressBook/ContactView/ContactViewPage.qml'
--- src/imports/Ubuntu/AddressBook/ContactView/ContactViewPage.qml	2015-08-17 18:47:15 +0000
+++ src/imports/Ubuntu/AddressBook/ContactView/ContactViewPage.qml	2015-10-16 13:35:13 +0000
@@ -17,8 +17,8 @@
 import QtQuick 2.2
 import QtContacts 5.0
 
-import Ubuntu.Components 1.2
-import Ubuntu.Components.Popups 1.0
+import Ubuntu.Components 1.3
+import Ubuntu.Components.Popups 1.3
 import Ubuntu.Contacts 0.1
 
 Page {
 
=== modified file 'src/imports/Ubuntu/Contacts/ActionButton.qml'
--- src/imports/Ubuntu/Contacts/ActionButton.qml	2015-08-17 18:47:15 +0000
+++ src/imports/Ubuntu/Contacts/ActionButton.qml	2015-10-16 13:35:13 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.2
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 
 AbstractButton {
     id: root
 
=== modified file 'src/imports/Ubuntu/Contacts/ContactAvatar.qml'
--- src/imports/Ubuntu/Contacts/ContactAvatar.qml	2015-08-17 18:47:15 +0000
+++ src/imports/Ubuntu/Contacts/ContactAvatar.qml	2015-10-16 13:35:13 +0000
@@ -16,7 +16,7 @@
 
 import QtQuick 2.2
 import QtContacts 5.0
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 import Ubuntu.Contacts 0.1
 import "Contacts.js" as ContactsJS
 
@@ -41,7 +41,7 @@
     }
 
     radius: "medium"
-    color: Theme.palette.normal.overlay
+    backgroundColor: Theme.palette.normal.overlay
 
     Label {
         id: initialsLabel
@@ -56,7 +56,7 @@
         visible: (img.status != Image.Ready)
     }
 
-    image: !img.visible ? img : null
+    source: !img.visible ? img : null
 
     Image {
         id: img
 
=== modified file 'src/imports/Ubuntu/Contacts/ContactDelegate.qml'
--- src/imports/Ubuntu/Contacts/ContactDelegate.qml	2015-08-17 18:47:15 +0000
+++ src/imports/Ubuntu/Contacts/ContactDelegate.qml	2015-10-16 13:35:13 +0000
@@ -16,8 +16,8 @@
 
 import QtQuick 2.2
 import QtContacts 5.0
-import Ubuntu.Components 1.2
-import Ubuntu.Components.ListItems 1.0 as ListItem
+import Ubuntu.Components 1.3
+import Ubuntu.Components.ListItems 1.3 as ListItem
 import "Contacts.js" as ContactsJS
 
 ListItemWithActions {
 
=== modified file 'src/imports/Ubuntu/Contacts/ContactDetailPickerPhoneNumberDelegate.qml'
--- src/imports/Ubuntu/Contacts/ContactDetailPickerPhoneNumberDelegate.qml	2015-08-17 18:47:15 +0000
+++ src/imports/Ubuntu/Contacts/ContactDetailPickerPhoneNumberDelegate.qml	2015-10-16 13:35:13 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.2
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 import QtContacts 5.0 as QtContacts
 
 Item {
 
=== modified file 'src/imports/Ubuntu/Contacts/ContactListButtonDelegate.qml'
--- src/imports/Ubuntu/Contacts/ContactListButtonDelegate.qml	2015-08-17 18:47:15 +0000
+++ src/imports/Ubuntu/Contacts/ContactListButtonDelegate.qml	2015-10-16 13:35:13 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 
 Item {
    id: root
@@ -49,8 +49,8 @@
        }
        width: height
        radius: "medium"
-       color: Theme.palette.normal.overlay
-       image: Image {
+       backgroundColor: Theme.palette.normal.overlay
+       source: Image {
            source: root.expandIcon ? root.iconSource : ""
        }
        Image {
 
=== modified file 'src/imports/Ubuntu/Contacts/ContactListView.qml'
--- src/imports/Ubuntu/Contacts/ContactListView.qml	2015-09-18 13:18:40 +0000
+++ src/imports/Ubuntu/Contacts/ContactListView.qml	2015-10-16 13:35:13 +0000
@@ -17,9 +17,9 @@
 import QtQuick 2.2
 import QtContacts 5.0
 
-import Ubuntu.Components 1.2
-import Ubuntu.Components.ListItems 1.0 as ListItem
-import Ubuntu.Components.Popups 1.0
+import Ubuntu.Components 1.3
+import Ubuntu.Components.ListItems 1.3 as ListItem
+import Ubuntu.Components.Popups 1.3
 import Ubuntu.Contacts 0.1 as Contacts
 import Buteo 0.1
 
 
=== modified file 'src/imports/Ubuntu/Contacts/ContactSimpleListView.qml'
--- src/imports/Ubuntu/Contacts/ContactSimpleListView.qml	2015-08-17 18:47:15 +0000
+++ src/imports/Ubuntu/Contacts/ContactSimpleListView.qml	2015-10-16 13:35:13 +0000
@@ -16,8 +16,8 @@
 
 import QtQuick 2.2
 import QtContacts 5.0
-import Ubuntu.Components 1.2
-import Ubuntu.Components.ListItems 1.0 as ListItem
+import Ubuntu.Components 1.3
+import Ubuntu.Components.ListItems 1.3 as ListItem
 
 import "ContactList.js" as Sections
 
 
=== modified file 'src/imports/Ubuntu/Contacts/FastScroll.qml'
--- src/imports/Ubuntu/Contacts/FastScroll.qml	2015-08-17 18:47:15 +0000
+++ src/imports/Ubuntu/Contacts/FastScroll.qml	2015-10-16 13:35:13 +0000
@@ -41,7 +41,7 @@
 
 // FastScroll.qml
 import QtQuick 2.2
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 import "FastScroll.js" as Sections
 
 Item {
 
=== modified file 'src/imports/Ubuntu/Contacts/ListItemWithActions.qml'
--- src/imports/Ubuntu/Contacts/ListItemWithActions.qml	2015-08-17 18:47:15 +0000
+++ src/imports/Ubuntu/Contacts/ListItemWithActions.qml	2015-10-16 13:35:13 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.2
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 
 Item {
     id: root
 
=== modified file 'src/imports/Ubuntu/Contacts/ListItemWithActionsCheckBox.qml'
--- src/imports/Ubuntu/Contacts/ListItemWithActionsCheckBox.qml	2015-08-17 18:47:15 +0000
+++ src/imports/Ubuntu/Contacts/ListItemWithActionsCheckBox.qml	2015-10-16 13:35:13 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.2
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 
 CheckBox {
     checked: root.selected
 
=== modified file 'src/imports/Ubuntu/Contacts/MultipleSelectionListView.qml'
--- src/imports/Ubuntu/Contacts/MultipleSelectionListView.qml	2015-08-17 18:47:15 +0000
+++ src/imports/Ubuntu/Contacts/MultipleSelectionListView.qml	2015-10-16 13:35:13 +0000
@@ -15,8 +15,8 @@
  */
 
 import QtQuick 2.2
-import Ubuntu.Components 1.2
-import Ubuntu.Components.Popups 1.0 as Popups
+import Ubuntu.Components 1.3
+import Ubuntu.Components.Popups 1.3 as Popups
 
 /*!
     \qmltype ContactSimpleListView
 
=== modified file 'src/imports/Ubuntu/Contacts/OnlineAccountsHelper.qml'
--- src/imports/Ubuntu/Contacts/OnlineAccountsHelper.qml	2015-08-17 18:47:15 +0000
+++ src/imports/Ubuntu/Contacts/OnlineAccountsHelper.qml	2015-10-16 13:35:13 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.2
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 import Ubuntu.OnlineAccounts 0.1
 import Ubuntu.OnlineAccounts.Client 0.1
 
 
=== modified file 'src/imports/Ubuntu/Contacts/PageWithBottomEdge.qml'
--- src/imports/Ubuntu/Contacts/PageWithBottomEdge.qml	2015-08-17 18:47:15 +0000
+++ src/imports/Ubuntu/Contacts/PageWithBottomEdge.qml	2015-10-16 13:35:13 +0000
@@ -63,7 +63,7 @@
 */
 
 import QtQuick 2.2
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 
 Page {
     id: page
@@ -170,7 +170,7 @@
         z: 1
         width: tipLabel.paintedWidth + units.gu(6)
         height: bottomEdge.tipHeight + units.gu(1)
-        color: Theme.palette.normal.overlay
+        backgroundColor: Theme.palette.normal.overlay
         Label {
             id: tipLabel
 
 
=== modified file 'src/imports/Ubuntu/Contacts/SIMCardImportPage.qml'
--- src/imports/Ubuntu/Contacts/SIMCardImportPage.qml	2015-08-17 18:47:15 +0000
+++ src/imports/Ubuntu/Contacts/SIMCardImportPage.qml	2015-10-16 13:35:13 +0000
@@ -17,9 +17,9 @@
 import QtQuick 2.2
 import QtContacts 5.0
 
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 import Ubuntu.Contacts 0.1
-import Ubuntu.Components.ListItems 1.0 as ListItem
+import Ubuntu.Components.ListItems 1.3 as ListItem
 
 import MeeGo.QOfono 0.2
 
 
=== modified file 'src/imports/Ubuntu/Contacts/SectionDelegate.qml'
--- src/imports/Ubuntu/Contacts/SectionDelegate.qml	2015-08-17 18:47:15 +0000
+++ src/imports/Ubuntu/Contacts/SectionDelegate.qml	2015-10-16 13:35:13 +0000
@@ -15,8 +15,8 @@
  */
 
 import QtQuick 2.2
-import Ubuntu.Components 1.2
-import Ubuntu.Components.ListItems 1.0
+import Ubuntu.Components 1.3
+import Ubuntu.Components.ListItems 1.3
 
 Rectangle {
     property alias text: title.text
 
=== modified file 'src/imports/Ubuntu/Contacts/SubtitledWithColors.qml'
--- src/imports/Ubuntu/Contacts/SubtitledWithColors.qml	2015-08-17 18:47:15 +0000
+++ src/imports/Ubuntu/Contacts/SubtitledWithColors.qml	2015-10-16 13:35:13 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 
 MouseArea {
     id: subtitledListItem
 
=== modified file 'src/imports/VCardImportDialog.qml'
--- src/imports/VCardImportDialog.qml	2015-08-17 18:47:15 +0000
+++ src/imports/VCardImportDialog.qml	2015-10-16 13:35:13 +0000
@@ -16,8 +16,8 @@
 
 import QtQuick 2.2
 import QtContacts 5.0
-import Ubuntu.Components 1.2
-import Ubuntu.Components.Popups 1.0 as Popups
+import Ubuntu.Components 1.3
+import Ubuntu.Components.Popups 1.3 as Popups
 
 Item {
     id: root
 
=== modified file 'tests/autopilot/address_book_app/__init__.py'
--- tests/autopilot/address_book_app/__init__.py	2015-06-10 17:25:15 +0000
+++ tests/autopilot/address_book_app/__init__.py	2015-10-16 13:35:13 +0000
@@ -124,7 +124,9 @@
                                        objectName="contactListView")
 
     def get_button(self, buttonName):
-        return self.get_header()._get_action_button(buttonName)
+        actionbar = self.select_single('ActionBar', objectName='headerActionBar')
+        return actionbar._get_action_button(buttonName)
+
 
     def open_header(self):
         header = self.get_header()
 
=== modified file 'tests/qml/tst_ContactEditor.qml'
--- tests/qml/tst_ContactEditor.qml	2015-08-17 18:47:15 +0000
+++ tests/qml/tst_ContactEditor.qml	2015-10-16 13:35:13 +0000
@@ -16,7 +16,7 @@
 
 import QtQuick 2.2
 import QtTest 1.0
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 import Ubuntu.Test 0.1
 import Ubuntu.Contacts 0.1
 
@@ -69,7 +69,7 @@
 
         function init() {
             waitForRendering(contactEditor);
-            var saveButton = findChild(root, 'save_header_button');
+            var saveButton = findChild(root, 'save_action_button');
             compare(saveButton.enabled, false);
         }
 
@@ -113,7 +113,7 @@
         function test_fillRequiredFieldsMustEnableSaveButton(data) {
             var textField = findChild(root, data.objectName);
             textField.text = 'test'
-            var saveButton = findChild(root, 'save_header_button');
+            var saveButton = findChild(root, 'save_action_button');
             tryCompare(saveButton, 'enabled', true);
         }
 
@@ -125,7 +125,7 @@
         function test_fillOptionalFieldsMustNotEnableSaveButton(data) {
             var textField = findChild(root, data.objectName);
             textField.text = 'test'
-            var saveButton = findChild(root, 'save_header_button');
+            var saveButton = findChild(root, 'save_action_button');
             tryCompare(saveButton, 'enabled', false);
         }
 
 
=== modified file 'tests/qml/tst_ContactList.qml'
--- tests/qml/tst_ContactList.qml	2015-08-17 18:47:15 +0000
+++ tests/qml/tst_ContactList.qml	2015-10-16 13:35:13 +0000
@@ -16,7 +16,7 @@
 
 import QtQuick 2.2
 import QtTest 1.0
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 import Ubuntu.Test 0.1
 import Ubuntu.Contacts 0.1
 
 
=== modified file 'tests/qml/tst_ContactListModel.qml'
--- tests/qml/tst_ContactListModel.qml	2015-08-17 18:47:15 +0000
+++ tests/qml/tst_ContactListModel.qml	2015-10-16 13:35:13 +0000
@@ -16,7 +16,7 @@
 
 import QtQuick 2.2
 import QtTest 1.0
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 import Ubuntu.Test 0.1
 import Ubuntu.Contacts 0.1
 
 
=== modified file 'tests/qml/tst_ContactListView.qml'
--- tests/qml/tst_ContactListView.qml	2015-08-17 18:47:15 +0000
+++ tests/qml/tst_ContactListView.qml	2015-10-16 13:35:13 +0000
@@ -16,7 +16,7 @@
 
 import QtQuick 2.2
 import QtTest 1.0
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 import Ubuntu.Test 0.1
 import Ubuntu.Contacts 0.1
 
 
=== modified file 'tests/qml/tst_ContactPreviewPage.qml'
--- tests/qml/tst_ContactPreviewPage.qml	2015-08-17 18:47:15 +0000
+++ tests/qml/tst_ContactPreviewPage.qml	2015-10-16 13:35:13 +0000
@@ -19,7 +19,7 @@
 import Ubuntu.Test 0.1
 import QtContacts 5.0
 
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 import Ubuntu.Contacts 0.1
 import Ubuntu.AddressBook.ContactView 0.1
 
 
=== modified file 'tests/qml/tst_ListWithActions.qml'
--- tests/qml/tst_ListWithActions.qml	2015-08-17 18:47:15 +0000
+++ tests/qml/tst_ListWithActions.qml	2015-10-16 13:35:13 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.2
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 import QtTest 1.0
 import Ubuntu.Test 0.1
 import Ubuntu.Contacts 0.1