Merge lp:~vthompson/music-app/fix-various-artists into lp:music-app/remix

[Victor Thompson]

Use AlbumsModel albumArtist property to display Various Artist albums.

Use AlbumsModel albumArtist property to display Various Artist albums. Since mediascanner2 can handle if there is no albumArtist field explicitly set in the database.

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Continuous integration, rev:752
http://91.189.93.70:8080/job/music-app-ci/1168/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-vivid/372
        deb: http://91.189.93.70:8080/job/generic-mediumtests-vivid/372/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/music-app-vivid-amd64-ci/20

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/music-app-ci/1168/rebuild

review: Needs Fixing (continuous-integration)

[lp:~vthompson/music-app/fix-various-artists]

753. By Victor Thompson on 2014-11-26

Implement the solution correctly

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:753
http://91.189.93.70:8080/job/music-app-ci/1169/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-vivid/373
        deb: http://91.189.93.70:8080/job/generic-mediumtests-vivid/373/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/music-app-vivid-amd64-ci/21

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/music-app-ci/1169/rebuild

review: Approve (continuous-integration)

[Andrew Hayzen (ahayzen)]

LGTM :)

review: Approve

=== modified file 'common/SongsPage.qml'
--- common/SongsPage.qml	2014-11-11 20:08:11 +0000
+++ common/SongsPage.qml	2014-11-26 02:33:47 +0000
@@ -43,7 +43,7 @@
 
     property var page
     property alias album: songsModel.album
-    property alias artist: songsModel.artist
+    property alias artist: songsModel.albumArtist
     property alias genre: songsModel.genre
 
     property bool playlistChanged: false