Merge lp:~ssweeny/friends-app/lp1261438 into lp:friends-app

[Scott Sweeny]

Remove iconSource definition from accountDelegate

According to [1] if both iconName and iconSource are defined iconName is ignored. Also, iconSource was apparently not being defined correctly which resulted in no icons being shown in the post screen anyway.

[1] http://developer.ubuntu.com/api/qml/sdk-14.04/Ubuntu.Components.ListItems.Standard/#iconName-prop

Remove iconSource definition from accountDelegate

According to [1] if both iconName and iconSource are defined iconName is ignored. Also, iconSource was apparently not being defined correctly which resulted in no icons being shown in the post screen anyway.

[1] http://developer.ubuntu.com/api/qml/sdk-14.04/Ubuntu.Components.ListItems.Standard/#iconName-prop

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:140
http://jenkins.qa.ubuntu.com/job/friends-app-ci/37/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/friends-app-trusty-amd64-ci/10
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/3261
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/2931
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/2869
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/3263
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/3263/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/2933
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/2933/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/5337
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/3992

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

review: Approve (continuous-integration)

[Kai Mast (kai-mast)]

Just tested this (on Desktop) and this really resolves the isusue for me. Yay!

review: Approve

=== modified file 'qml/Post.qml'
--- qml/Post.qml	2014-01-24 12:47:22 +0000
+++ qml/Post.qml	2014-02-17 05:46:43 +0000
@@ -251,9 +251,6 @@
                     }
                 }
 
-                //Show no icon if none is available
-                iconSource: iconName.length > 0 ? "image://gicon/"+iconName : ""
-
                 control: CheckBox {
                     id: sw
                     checked: sendEnabled