lp:~ahayzen/music-app/bump-ubuntu-comp-11-qtquick-22

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:music-app/trusty at revision 593

Victor Thompson: Approve on 2014-08-21

Ubuntu Phone Apps Jenkins Bot: Approve (continuous-integration) on 2014-08-21

Diff: 538 lines (+80/-89)

30 files modified

LibraryListModel.qml (+1/-1)
LoginLastFM.qml (+4/-5)
MusicAlbums.qml (+4/-7)
MusicArtists.qml (+4/-5)
MusicNowPlaying.qml (+2/-2)
MusicPlaylists.qml (+3/-3)
MusicSearch.qml (+4/-4)
MusicSettings.qml (+4/-4)
MusicStart.qml (+6/-8)
MusicToolbar.qml (+3/-3)
MusicTracks.qml (+3/-4)
MusicaddtoPlaylist.qml (+4/-4)
Player.qml (+1/-1)
Style.qml (+2/-2)
common/AlbumsPage.qml (+4/-4)
common/BlurredBackground.qml (+2/-2)
common/CoverRow.qml (+2/-2)
common/ListItemActions/AddToPlaylist.qml (+2/-2)
common/ListItemActions/AddToQueue.qml (+1/-1)
common/ListItemActions/DeletePlaylist.qml (+3/-3)
common/ListItemActions/EditPlaylist.qml (+2/-2)
common/ListItemActions/Remove.qml (+3/-3)
common/ListItemWithActions.qml (+1/-1)
common/LoadingSpinnerComponent.qml (+2/-2)
common/MusicPage.qml (+1/-1)
common/MusicRow.qml (+2/-2)
common/SongsPage.qml (+3/-3)
common/SwipeDelete.qml (+2/-2)
music-app.qml (+3/-4)
tests/autopilot/music_app/__init__.py (+2/-2)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

592. By Andrew Hayzen on 2014-08-21

* Bump Page10 to Page11 as Ubuntu.Components has been bumped to 1.1

591. By Andrew Hayzen on 2014-08-21

* Reverse cherry pick 587-588

590. By Andrew Hayzen on 2014-08-21

* Merge of trunk

589. By Andrew Hayzen on 2014-08-21

* Bump Ubuntu.Components.Popups and Ubuntu.Components.ListItems to 1.0
* Remove duplicate entries of Ubuntu.Components.ListItems

588. By Andrew Hayzen on 2014-08-20

* Remove useDeprecatedToolbar: false as it is false in ubuntu components 1.1

587. By Andrew Hayzen on 2014-08-20

* Bump Ubuntu.Components to 1.1
* Bump QtQuick to 2.2

586. By Launchpad Translations on behalf of music-app-dev on 2014-08-20

Launchpad automatic translations update.

585. By Andrew Hayzen on 2014-08-20

* Add content-hub destination support. Fixes: https://bugs.launchpad.net/bugs/1347444.

Approved by Victor Thompson, Ubuntu Phone Apps Jenkins Bot.

584. By Launchpad Translations on behalf of music-app-dev on 2014-08-19

Launchpad automatic translations update.

583. By Andrew Hayzen on 2014-08-18

* Switch to custom proxy object emulator, instead of calling via old emulators module. Fixes: https://bugs.launchpad.net/bugs/1341681.

Approved by Victor Thompson, Nicholas Skaggs, Ubuntu Phone Apps Jenkins Bot.