Merge lp:~canonical-platform-qa/address-book-app/avatar-objectname into lp:address-book-app

[Richard Huddie]

Add an object name to the contact detail avatar image, so that it can be used for autopilot testing. This will allow a photo to be added to a contact.

Add an object name to the contact detail avatar image, so that it can be used for autopilot testing. This will allow a photo to be added to a contact.

[Leo Arias (elopio)]

review: Approve

[lp:~canonical-platform-qa/address-book-app/avatar-objectname]

388. By Richard Huddie on 2015-02-25

update copyright date

[Renato Araujo Oliveira Filho (renatofilho)]

+1

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:387
http://jenkins.qa.ubuntu.com/job/address-book-app-ci/753/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-app-vivid-i386-ci/56
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/1527
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-vivid/648
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/1357
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1525
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1525/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/18338
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-vivid/516
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/762
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/762/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)

=== modified file 'src/imports/ContactEdit/ContactDetailAvatarEditor.qml'
--- src/imports/ContactEdit/ContactDetailAvatarEditor.qml	2014-09-29 13:20:08 +0000
+++ src/imports/ContactEdit/ContactDetailAvatarEditor.qml	2015-02-25 15:44:20 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2013 Canonical, Ltd.
+ * Copyright (C) 2012-2015 Canonical, Ltd.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -74,6 +74,7 @@
 
         Image {
             id: avatarImage
+            objectName: "avatarImage"
 
             fillMode: Image.PreserveAspectCrop
             asynchronous: true