Merge lp://qastaging/~music-app-dev/music-app/media-hub-bg-playlists-rework into lp://qastaging/music-app
Proposed by
Andrew Hayzen
Status: | Merged |
---|---|
Approved by: | Victor Thompson |
Approved revision: | 943 |
Merged at revision: | 964 |
Proposed branch: | lp://qastaging/~music-app-dev/music-app/media-hub-bg-playlists-rework |
Merge into: | lp://qastaging/music-app |
Diff against target: |
2709 lines (+461/-752) 30 files modified
app/components/BlurredBackground.qml (+2/-2) app/components/Flickables/MultiSelectListView.qml (+9/-2) app/components/HeadState/MultiSelectHeadState.qml (+4/-4) app/components/Helpers/ContentHubHelper.qml (+11/-8) app/components/Helpers/UriHandlerHelper.qml (+17/-32) app/components/Helpers/UserMetricsHelper.qml (+10/-7) app/components/ListItemActions/AddToPlaylist.qml (+6/-2) app/components/ListItemActions/AddToQueue.qml (+2/-2) app/components/MusicToolbar.qml (+37/-23) app/components/NowPlayingFullView.qml (+57/-17) app/components/NowPlayingToolbar.qml (+18/-30) app/components/Player.qml (+0/-240) app/components/Queue.qml (+18/-20) app/components/ViewButton/PlayAllButton.qml (+6/-2) app/components/ViewButton/QueueAllButton.qml (+6/-2) app/components/ViewButton/ShuffleButton.qml (+6/-2) app/logic/meta-database.js (+14/-4) app/logic/playlists.js (+9/-2) app/music-app.qml (+93/-220) app/ui/AddToPlaylist.qml (+0/-1) app/ui/ContentHubExport.qml (+8/-17) app/ui/NowPlaying.qml (+29/-16) app/ui/Playlists.qml (+0/-1) app/ui/Recent.qml (+0/-1) app/ui/Songs.qml (+2/-3) debian/changelog (+4/-1) debian/control (+1/-0) manifest.json.in (+1/-1) tests/autopilot/music_app/__init__.py (+30/-11) tests/autopilot/music_app/tests/test_music.py (+61/-79) |
To merge this branch: | bzr merge lp://qastaging/~music-app-dev/music-app/media-hub-bg-playlists-rework |
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Jenkins Bot | continuous-integration | Approve | |
Victor Thompson | Approve | ||
Review via email:
|
Commit message
* Add support for media-hub background playlists
* Bump framework to 15.04.3-qml
* Bump QtMultimedia import to 5.6
Description of the change
* Add support for media-hub background playlists
* Bump framework to 15.04.3-qml
* Bump QtMultimedia import to 5.6
To post a comment you must log in.
I added a few inline comments. There are many TODOs and FIXMEs that should still be investigated/fixed. If we end up leaving any in the merge into trunk, we should maybe clearly tag them with something like "bgplaylists" so we can easily find them in the near future.