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

[Ken VanDine]

use content-hub 1.3 imports

use content-hub 1.3 imports

[lp:~ken-vandine/address-book-app/use_content_1_3]

485. By Ken VanDine on 2015-09-21

bumped depends version for qtdeclarative5-ubuntu-content1 to ensure we get ContentPeerPicker13

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:485
http://jenkins.qa.ubuntu.com/job/address-book-app-ci/926/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/address-book-app-vivid-i386-ci/229/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/4295/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4292/console

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

review: Needs Fixing (continuous-integration)

[Michael Sheldon (michael-sheldon)]

Added in line comment for broken build-dep

review: Needs Fixing

=== modified file 'debian/control'
--- debian/control	2015-05-14 21:23:43 +0000
+++ debian/control	2015-09-21 15:16:20 +0000
@@ -15,7 +15,7 @@
                qtdeclarative5-gsettings1.0 [i386 amd64 armhf],
                qtdeclarative5-ofono0.2 [i386 amd64 armhf],
                qtdeclarative5-qtcontacts-plugin [i386 amd64 armhf],
-               qtdeclarative5-ubuntu-content1 [i386 amd64 armhf],
+               qtdeclarative5-ubuntu-content1 [i386 amd64 armhf] (>= 0.1),
                qtdeclarative5-ubuntu-history0.1 [i386 amd64 armhf],
                qtdeclarative5-ubuntu-keyboard-extensions0.1 [i386 amd64 armhf],
                qtdeclarative5-ubuntu-syncmonitor0.1 [i386 amd64 armhf],
@@ -77,7 +77,7 @@
 Package: qtdeclarative5-ubuntu-addressbook0.1
 Architecture: any
 Depends: qtdeclarative5-ubuntu-contacts0.1 (= ${binary:Version}), 
-         qtdeclarative5-ubuntu-content1,
+         qtdeclarative5-ubuntu-content1 (>= 0.1),
          ${misc:Depends},
          ${shlibs:Depends},
 Description: Qt Ubuntu Address Book  Components - QML plugin

=== modified file 'src/imports/ABContactListPage.qml'
--- src/imports/ABContactListPage.qml	2015-09-21 15:16:20 +0000
+++ src/imports/ABContactListPage.qml	2015-09-21 15:16:20 +0000
@@ -21,7 +21,7 @@
 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
+import Ubuntu.Content 1.3 as ContentHub
 
 import Ubuntu.AddressBook.Base 0.1
 import Ubuntu.AddressBook.ContactShare 0.1

=== modified file 'src/imports/ContentHubProxy.qml'
--- src/imports/ContentHubProxy.qml	2015-05-07 17:27:16 +0000
+++ src/imports/ContentHubProxy.qml	2015-09-21 15:16:20 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.2
-import Ubuntu.Content 0.1 as ContentHub
+import Ubuntu.Content 1.3 as ContentHub
 
 QtObject {
     property QtObject pageStack: null

=== modified file 'src/imports/Ubuntu/AddressBook/Base/ContactExporter.qml'
--- src/imports/Ubuntu/AddressBook/Base/ContactExporter.qml	2015-09-21 15:16:20 +0000
+++ src/imports/Ubuntu/AddressBook/Base/ContactExporter.qml	2015-09-21 15:16:20 +0000
@@ -18,7 +18,7 @@
 import QtContacts 5.0
 
 import Ubuntu.Components 1.3
-import Ubuntu.Content 1.1
+import Ubuntu.Content 1.3
 import Ubuntu.Components.Popups 1.3
 
 Item {

=== modified file 'src/imports/Ubuntu/AddressBook/ContactEditor/AvatarImport.qml'
--- src/imports/Ubuntu/AddressBook/ContactEditor/AvatarImport.qml	2015-09-21 15:16:20 +0000
+++ src/imports/Ubuntu/AddressBook/ContactEditor/AvatarImport.qml	2015-09-21 15:16:20 +0000
@@ -18,7 +18,7 @@
 
 import Ubuntu.Components 1.3
 import Ubuntu.Components.Popups 1.3
-import Ubuntu.Content 0.1
+import Ubuntu.Content 1.3
 
 Item {
     id: root

=== modified file 'src/imports/Ubuntu/AddressBook/ContactShare/ContactSharePage.qml'
--- src/imports/Ubuntu/AddressBook/ContactShare/ContactSharePage.qml	2015-09-21 15:16:20 +0000
+++ src/imports/Ubuntu/AddressBook/ContactShare/ContactSharePage.qml	2015-09-21 15:16:20 +0000
@@ -18,7 +18,7 @@
 import QtContacts 5.0
 
 import Ubuntu.Components 1.3
-import Ubuntu.Content 1.1 as ContentHub
+import Ubuntu.Content 1.3 as ContentHub
 
 import Ubuntu.AddressBook.Base 0.1
 
@@ -36,6 +36,7 @@
         anchors.fill: parent
         contentType: ContentHub.ContentType.Contacts
         handler: ContentHub.ContentHandler.Share
+        showTitle: false
 
         onPeerSelected: {
             exporter.activeTransfer = peer.request();