ubuntu-touch-coreapps-reviewers team mailing list archive
-
ubuntu-touch-coreapps-reviewers team
-
Mailing list archive
-
Message #04621
[Merge] lp:~vthompson/music-app/music-uc1.3 into lp:music-app
Victor Thompson has proposed merging lp:~vthompson/music-app/music-uc1.3 into lp:music-app.
Commit message:
Upgrade to Ubuntu Components 1.3
Requested reviews:
Music App Developers (music-app-dev)
For more details, see:
https://code.launchpad.net/~vthompson/music-app/music-uc1.3/+merge/267889
Upgrade to Ubuntu Components 1.3. For now, this is mostly just useful to use as a springboard for testing the new AdaptivePageLayout and other convergence features in UC 1.3.
--
Your team Music App Developers is requested to review the proposed merge of lp:~vthompson/music-app/music-uc1.3 into lp:music-app.
=== modified file 'app/components/BlurredBackground.qml'
--- app/components/BlurredBackground.qml 2015-05-03 16:22:31 +0000
+++ app/components/BlurredBackground.qml 2015-08-27 23:24:02 +0000
@@ -18,7 +18,7 @@
*/
import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
import QtGraphicalEffects 1.0
// Blurred background
=== modified file 'app/components/BlurredHeader.qml'
--- app/components/BlurredHeader.qml 2015-05-03 16:22:31 +0000
+++ app/components/BlurredHeader.qml 2015-08-27 23:24:02 +0000
@@ -17,7 +17,7 @@
*/
import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
import Ubuntu.Components.ListItems 1.0 as ListItem
ListItem.Standard {
=== modified file 'app/components/CoverGrid.qml'
--- app/components/CoverGrid.qml 2015-05-03 16:22:31 +0000
+++ app/components/CoverGrid.qml 2015-08-27 23:24:02 +0000
@@ -18,7 +18,7 @@
*/
import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
Item {
id: coverGrid
=== modified file 'app/components/Delegates/Card.qml'
--- app/components/Delegates/Card.qml 2015-05-03 16:22:31 +0000
+++ app/components/Delegates/Card.qml 2015-08-27 23:24:02 +0000
@@ -16,7 +16,7 @@
*/
import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
import "../"
=== modified file 'app/components/Delegates/ListItemWithActions.qml'
--- app/components/Delegates/ListItemWithActions.qml 2015-05-03 16:22:31 +0000
+++ app/components/Delegates/ListItemWithActions.qml 2015-08-27 23:24:02 +0000
@@ -15,7 +15,7 @@
*/
import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
import Ubuntu.Components.ListItems 1.0 as ListItem
=== modified file 'app/components/Delegates/MusicListItem.qml'
--- app/components/Delegates/MusicListItem.qml 2015-05-03 16:22:31 +0000
+++ app/components/Delegates/MusicListItem.qml 2015-08-27 23:24:02 +0000
@@ -18,7 +18,7 @@
*/
import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
import "../"
=== modified file 'app/components/Dialog/ContentHubErrorDialog.qml'
--- app/components/Dialog/ContentHubErrorDialog.qml 2015-05-03 16:22:31 +0000
+++ app/components/Dialog/ContentHubErrorDialog.qml 2015-08-27 23:24:02 +0000
@@ -18,7 +18,7 @@
*/
import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
import Ubuntu.Components.Popups 1.0
Dialog {
=== modified file 'app/components/Dialog/ContentHubNotFoundDialog.qml'
--- app/components/Dialog/ContentHubNotFoundDialog.qml 2015-05-03 16:22:31 +0000
+++ app/components/Dialog/ContentHubNotFoundDialog.qml 2015-08-27 23:24:02 +0000
@@ -18,7 +18,7 @@
*/
import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
import Ubuntu.Components.Popups 1.0
Dialog {
=== modified file 'app/components/Dialog/ContentHubWaitDialog.qml'
--- app/components/Dialog/ContentHubWaitDialog.qml 2015-05-03 16:22:31 +0000
+++ app/components/Dialog/ContentHubWaitDialog.qml 2015-08-27 23:24:02 +0000
@@ -18,7 +18,7 @@
*/
import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
import Ubuntu.Components.Popups 1.0
import "../"
=== modified file 'app/components/Dialog/EditPlaylistDialog.qml'
--- app/components/Dialog/EditPlaylistDialog.qml 2015-05-03 16:22:31 +0000
+++ app/components/Dialog/EditPlaylistDialog.qml 2015-08-27 23:24:02 +0000
@@ -18,7 +18,7 @@
*/
import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
import Ubuntu.Components.Popups 1.0
import QtQuick.LocalStorage 2.0
import "../../logic/meta-database.js" as Library
=== modified file 'app/components/Dialog/NewPlaylistDialog.qml'
--- app/components/Dialog/NewPlaylistDialog.qml 2015-05-03 16:22:31 +0000
+++ app/components/Dialog/NewPlaylistDialog.qml 2015-08-27 23:24:02 +0000
@@ -18,7 +18,7 @@
*/
import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
import Ubuntu.Components.Popups 1.0
import QtQuick.LocalStorage 2.0
import "../../logic/playlists.js" as Playlists
=== modified file 'app/components/Dialog/RemovePlaylistDialog.qml'
--- app/components/Dialog/RemovePlaylistDialog.qml 2015-05-03 16:22:31 +0000
+++ app/components/Dialog/RemovePlaylistDialog.qml 2015-08-27 23:24:02 +0000
@@ -18,7 +18,7 @@
*/
import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
import Ubuntu.Components.Popups 1.0
import QtQuick.LocalStorage 2.0
import "../../logic/meta-database.js" as Library
=== modified file 'app/components/Flickables/CardView.qml'
--- app/components/Flickables/CardView.qml 2015-07-02 18:16:05 +0000
+++ app/components/Flickables/CardView.qml 2015-08-27 23:24:02 +0000
@@ -16,7 +16,7 @@
*/
import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
import "../"
=== modified file 'app/components/Flickables/MultiSelectListView.qml'
--- app/components/Flickables/MultiSelectListView.qml 2015-05-03 16:22:31 +0000
+++ app/components/Flickables/MultiSelectListView.qml 2015-08-27 23:24:02 +0000
@@ -18,7 +18,7 @@
*/
import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
MusicListView {
property var selectedItems: []
=== modified file 'app/components/Flickables/MusicListView.qml'
--- app/components/Flickables/MusicListView.qml 2015-05-03 16:22:31 +0000
+++ app/components/Flickables/MusicListView.qml 2015-08-27 23:24:02 +0000
@@ -18,7 +18,7 @@
*/
import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
ListView {
=== modified file 'app/components/HeadState/MultiSelectHeadState.qml'
--- app/components/HeadState/MultiSelectHeadState.qml 2015-06-27 21:06:26 +0000
+++ app/components/HeadState/MultiSelectHeadState.qml 2015-08-27 23:24:02 +0000
@@ -17,7 +17,7 @@
*/
import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
PageHeadState {
id: selectionState
=== modified file 'app/components/HeadState/PlaylistsHeadState.qml'
--- app/components/HeadState/PlaylistsHeadState.qml 2015-05-03 16:22:31 +0000
+++ app/components/HeadState/PlaylistsHeadState.qml 2015-08-27 23:24:02 +0000
@@ -17,7 +17,7 @@
*/
import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
import Ubuntu.Components.Popups 1.0
=== modified file 'app/components/HeadState/SearchHeadState.qml'
--- app/components/HeadState/SearchHeadState.qml 2015-05-03 16:22:31 +0000
+++ app/components/HeadState/SearchHeadState.qml 2015-08-27 23:24:02 +0000
@@ -17,7 +17,7 @@
*/
import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
PageHeadState {
id: headerState
=== modified file 'app/components/HeadState/SearchableHeadState.qml'
--- app/components/HeadState/SearchableHeadState.qml 2015-05-03 16:22:31 +0000
+++ app/components/HeadState/SearchableHeadState.qml 2015-08-27 23:24:02 +0000
@@ -17,7 +17,7 @@
*/
import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
PageHeadState {
=== modified file 'app/components/Helpers/ContentHubHelper.qml'
--- app/components/Helpers/ContentHubHelper.qml 2015-08-18 21:08:05 +0000
+++ app/components/Helpers/ContentHubHelper.qml 2015-08-27 23:24:02 +0000
@@ -18,7 +18,7 @@
*/
import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
import Ubuntu.Components.Popups 1.0
import Ubuntu.Content 1.1
import "../../logic/stored-request.js" as StoredRequest
=== modified file 'app/components/Helpers/UriHandlerHelper.qml'
--- app/components/Helpers/UriHandlerHelper.qml 2015-06-28 03:06:49 +0000
+++ app/components/Helpers/UriHandlerHelper.qml 2015-08-27 23:24:02 +0000
@@ -18,7 +18,7 @@
*/
import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
import "../"
import "../../logic/stored-request.js" as StoredRequest
=== modified file 'app/components/Helpers/UserMetricsHelper.qml'
--- app/components/Helpers/UserMetricsHelper.qml 2015-05-03 16:22:31 +0000
+++ app/components/Helpers/UserMetricsHelper.qml 2015-08-27 23:24:02 +0000
@@ -18,7 +18,7 @@
*/
import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
import UserMetrics 0.1
=== modified file 'app/components/ListItemActions/AddToPlaylist.qml'
--- app/components/ListItemActions/AddToPlaylist.qml 2015-06-27 21:06:26 +0000
+++ app/components/ListItemActions/AddToPlaylist.qml 2015-08-27 23:24:02 +0000
@@ -18,7 +18,7 @@
*/
import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
Action {
iconName: "add-to-playlist"
=== modified file 'app/components/ListItemActions/AddToQueue.qml'
--- app/components/ListItemActions/AddToQueue.qml 2015-05-03 16:22:31 +0000
+++ app/components/ListItemActions/AddToQueue.qml 2015-08-27 23:24:02 +0000
@@ -19,7 +19,7 @@
import QtQuick 2.4
import QtQuick.LocalStorage 2.0
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
import "../../logic/meta-database.js" as Library
Action {
=== modified file 'app/components/ListItemActions/CheckBox.qml'
--- app/components/ListItemActions/CheckBox.qml 2015-06-27 20:18:02 +0000
+++ app/components/ListItemActions/CheckBox.qml 2015-08-27 23:24:02 +0000
@@ -15,7 +15,7 @@
*/
import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
CheckBox {
checked: root.selected
=== modified file 'app/components/ListItemActions/Remove.qml'
--- app/components/ListItemActions/Remove.qml 2015-05-03 16:22:31 +0000
+++ app/components/ListItemActions/Remove.qml 2015-08-27 23:24:02 +0000
@@ -18,7 +18,7 @@
*/
import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
import Ubuntu.Components.Popups 1.0
Action {
=== modified file 'app/components/ListItemReorderComponent.qml'
--- app/components/ListItemReorderComponent.qml 2015-05-03 16:22:31 +0000
+++ app/components/ListItemReorderComponent.qml 2015-08-27 23:24:02 +0000
@@ -18,7 +18,7 @@
*/
import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
Item {
=== modified file 'app/components/LoadingSpinnerComponent.qml'
--- app/components/LoadingSpinnerComponent.qml 2015-05-03 16:22:31 +0000
+++ app/components/LoadingSpinnerComponent.qml 2015-08-27 23:24:02 +0000
@@ -18,7 +18,7 @@
* Andrew Starr-Bochicchio <a.starr.b@xxxxxxxxx>
*/
import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
Item {
id: refresh
=== modified file 'app/components/MusicPage.qml'
--- app/components/MusicPage.qml 2015-08-19 14:03:16 +0000
+++ app/components/MusicPage.qml 2015-08-27 23:24:02 +0000
@@ -18,7 +18,7 @@
*/
import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
import Ubuntu.Components.Popups 1.0
=== modified file 'app/components/MusicRow.qml'
--- app/components/MusicRow.qml 2015-05-03 16:22:31 +0000
+++ app/components/MusicRow.qml 2015-08-27 23:24:02 +0000
@@ -18,7 +18,7 @@
*/
import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
Row {
=== modified file 'app/components/MusicToolbar.qml'
--- app/components/MusicToolbar.qml 2015-07-29 01:23:11 +0000
+++ app/components/MusicToolbar.qml 2015-08-27 23:24:02 +0000
@@ -19,7 +19,7 @@
import QtQuick 2.4
import QtMultimedia 5.0
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
Rectangle {
anchors {
=== modified file 'app/components/NowPlayingFullView.qml'
--- app/components/NowPlayingFullView.qml 2015-05-03 16:22:31 +0000
+++ app/components/NowPlayingFullView.qml 2015-08-27 23:24:02 +0000
@@ -18,7 +18,7 @@
*/
import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
import Ubuntu.Thumbnailer 0.1
import "../components/Themes/Ambiance"
=== modified file 'app/components/NowPlayingToolbar.qml'
--- app/components/NowPlayingToolbar.qml 2015-07-29 01:23:11 +0000
+++ app/components/NowPlayingToolbar.qml 2015-08-27 23:24:02 +0000
@@ -19,7 +19,7 @@
import QtMultimedia 5.0
import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
/* Full toolbar */
=== modified file 'app/components/PlaylistsEmptyState.qml'
--- app/components/PlaylistsEmptyState.qml 2015-05-03 16:22:31 +0000
+++ app/components/PlaylistsEmptyState.qml 2015-08-27 23:24:02 +0000
@@ -18,7 +18,7 @@
*/
import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
Rectangle {
=== modified file 'app/components/Queue.qml'
--- app/components/Queue.qml 2015-06-27 21:06:26 +0000
+++ app/components/Queue.qml 2015-08-27 23:24:02 +0000
@@ -19,7 +19,7 @@
import QtQuick 2.4
import QtQuick.LocalStorage 2.0
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
import "Delegates"
import "Flickables"
import "ListItemActions"
=== modified file 'app/components/Style.qml'
--- app/components/Style.qml 2015-05-03 16:22:31 +0000
+++ app/components/Style.qml 2015-08-27 23:24:02 +0000
@@ -18,7 +18,7 @@
*/
import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
QtObject {
=== modified file 'app/components/Themes/Ambiance/BubbleShape.qml'
--- app/components/Themes/Ambiance/BubbleShape.qml 2015-06-20 17:49:57 +0000
+++ app/components/Themes/Ambiance/BubbleShape.qml 2015-08-27 23:24:02 +0000
@@ -15,7 +15,7 @@
*/
import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
Item {
id: bubbleShape
=== modified file 'app/components/Themes/Ambiance/UbuntuBlueSliderStyle.qml'
--- app/components/Themes/Ambiance/UbuntuBlueSliderStyle.qml 2015-06-20 17:49:57 +0000
+++ app/components/Themes/Ambiance/UbuntuBlueSliderStyle.qml 2015-08-27 23:24:02 +0000
@@ -15,7 +15,7 @@
*/
import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
/*
The default slider style consists of a bar and a thumb shape.
=== modified file 'app/components/ViewButton/PlayAllButton.qml'
--- app/components/ViewButton/PlayAllButton.qml 2015-05-03 16:22:31 +0000
+++ app/components/ViewButton/PlayAllButton.qml 2015-08-27 23:24:02 +0000
@@ -18,7 +18,7 @@
*/
import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
Button {
=== modified file 'app/components/ViewButton/QueueAllButton.qml'
--- app/components/ViewButton/QueueAllButton.qml 2015-05-03 16:22:31 +0000
+++ app/components/ViewButton/QueueAllButton.qml 2015-08-27 23:24:02 +0000
@@ -18,7 +18,7 @@
*/
import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
Button {
=== modified file 'app/components/ViewButton/ShuffleButton.qml'
--- app/components/ViewButton/ShuffleButton.qml 2015-05-03 16:22:31 +0000
+++ app/components/ViewButton/ShuffleButton.qml 2015-08-27 23:24:02 +0000
@@ -18,7 +18,7 @@
*/
import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
Button {
=== modified file 'app/components/Walkthrough/FirstRunWalkthrough.qml'
--- app/components/Walkthrough/FirstRunWalkthrough.qml 2015-05-03 16:22:31 +0000
+++ app/components/Walkthrough/FirstRunWalkthrough.qml 2015-08-27 23:24:02 +0000
@@ -20,7 +20,7 @@
*/
import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
// Initial Walkthrough tutorial
Walkthrough {
=== modified file 'app/components/Walkthrough/Slide1.qml'
--- app/components/Walkthrough/Slide1.qml 2015-05-03 16:22:31 +0000
+++ app/components/Walkthrough/Slide1.qml 2015-08-27 23:24:02 +0000
@@ -21,7 +21,7 @@
*/
import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
// Slide 1
Component {
=== modified file 'app/components/Walkthrough/Slide2.qml'
--- app/components/Walkthrough/Slide2.qml 2015-05-03 16:22:31 +0000
+++ app/components/Walkthrough/Slide2.qml 2015-08-27 23:24:02 +0000
@@ -21,7 +21,7 @@
*/
import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
// Walkthrough - Slide 2
Component {
=== modified file 'app/components/Walkthrough/Slide3.qml'
--- app/components/Walkthrough/Slide3.qml 2015-05-03 16:22:31 +0000
+++ app/components/Walkthrough/Slide3.qml 2015-08-27 23:24:02 +0000
@@ -21,7 +21,7 @@
*/
import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
// Walkthrough - Slide 7
Component {
=== modified file 'app/components/Walkthrough/Walkthrough.qml'
--- app/components/Walkthrough/Walkthrough.qml 2015-05-03 16:22:31 +0000
+++ app/components/Walkthrough/Walkthrough.qml 2015-08-27 23:24:02 +0000
@@ -21,7 +21,7 @@
*/
import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
import Ubuntu.Components.ListItems 1.0 as ListItem
Page {
=== modified file 'app/components/WorkerWaiter.qml'
--- app/components/WorkerWaiter.qml 2015-05-03 16:22:31 +0000
+++ app/components/WorkerWaiter.qml 2015-08-27 23:24:02 +0000
@@ -18,7 +18,7 @@
*/
import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
Timer { // A timer to wait for a worker to stop
=== modified file 'app/music-app.qml'
--- app/music-app.qml 2015-08-19 14:03:16 +0000
+++ app/music-app.qml 2015-08-27 23:24:02 +0000
@@ -18,7 +18,7 @@
*/
import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
import Ubuntu.Components.Popups 1.0
import Ubuntu.MediaScanner 0.1
import Qt.labs.settings 1.0
=== modified file 'app/ui/AddToPlaylist.qml'
--- app/ui/AddToPlaylist.qml 2015-08-19 14:03:16 +0000
+++ app/ui/AddToPlaylist.qml 2015-08-27 23:24:02 +0000
@@ -19,7 +19,7 @@
import QtMultimedia 5.0
import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
import Ubuntu.Components.ListItems 1.0 as ListItem
import Ubuntu.Components.Popups 1.0
import QtQuick.LocalStorage 2.0
=== modified file 'app/ui/Albums.qml'
--- app/ui/Albums.qml 2015-05-03 16:22:31 +0000
+++ app/ui/Albums.qml 2015-08-27 23:24:02 +0000
@@ -18,7 +18,7 @@
*/
import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
import Ubuntu.MediaScanner 0.1
import "../components"
import "../components/Delegates"
=== modified file 'app/ui/ArtistView.qml'
--- app/ui/ArtistView.qml 2015-05-03 16:22:31 +0000
+++ app/ui/ArtistView.qml 2015-08-27 23:24:02 +0000
@@ -18,7 +18,7 @@
*/
import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
import Ubuntu.Components.Popups 1.0
import Ubuntu.Components.ListItems 1.0 as ListItem
import Ubuntu.MediaScanner 0.1
=== modified file 'app/ui/Artists.qml'
--- app/ui/Artists.qml 2015-05-03 16:22:31 +0000
+++ app/ui/Artists.qml 2015-08-27 23:24:02 +0000
@@ -18,7 +18,7 @@
*/
import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
import Ubuntu.Components.Popups 1.0
import Ubuntu.Components.ListItems 1.0 as ListItem
import Ubuntu.MediaScanner 0.1
=== modified file 'app/ui/Genres.qml'
--- app/ui/Genres.qml 2015-05-03 16:22:31 +0000
+++ app/ui/Genres.qml 2015-08-27 23:24:02 +0000
@@ -18,7 +18,7 @@
*/
import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
import Ubuntu.MediaScanner 0.1
import "../components"
import "../components/Delegates"
=== modified file 'app/ui/LibraryEmptyState.qml'
--- app/ui/LibraryEmptyState.qml 2015-05-03 16:22:31 +0000
+++ app/ui/LibraryEmptyState.qml 2015-08-27 23:24:02 +0000
@@ -18,7 +18,7 @@
*/
import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
Page {
id: libraryEmptyPage
=== modified file 'app/ui/NowPlaying.qml'
--- app/ui/NowPlaying.qml 2015-08-19 14:03:16 +0000
+++ app/ui/NowPlaying.qml 2015-08-27 23:24:02 +0000
@@ -19,7 +19,7 @@
import QtQuick 2.4
import QtQuick.LocalStorage 2.0
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
import "../components"
import "../components/HeadState"
import "../logic/meta-database.js" as Library
=== modified file 'app/ui/Playlists.qml'
--- app/ui/Playlists.qml 2015-06-27 21:06:26 +0000
+++ app/ui/Playlists.qml 2015-08-27 23:24:02 +0000
@@ -19,7 +19,7 @@
*/
import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
import Ubuntu.Components.Popups 1.0
import QtMultimedia 5.0
import QtQuick.LocalStorage 2.0
=== modified file 'app/ui/Recent.qml'
--- app/ui/Recent.qml 2015-06-27 21:06:26 +0000
+++ app/ui/Recent.qml 2015-08-27 23:24:02 +0000
@@ -18,7 +18,7 @@
*/
import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
import Ubuntu.Components.Popups 1.0
import Ubuntu.Components.ListItems 1.0 as ListItem
import Ubuntu.MediaScanner 0.1
=== modified file 'app/ui/Songs.qml'
--- app/ui/Songs.qml 2015-06-27 21:06:26 +0000
+++ app/ui/Songs.qml 2015-08-27 23:24:02 +0000
@@ -18,7 +18,7 @@
*/
import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
import Ubuntu.MediaScanner 0.1
import Ubuntu.Thumbnailer 0.1
import QtMultimedia 5.0
=== modified file 'app/ui/SongsView.qml'
--- app/ui/SongsView.qml 2015-07-26 22:43:31 +0000
+++ app/ui/SongsView.qml 2015-08-27 23:24:02 +0000
@@ -18,7 +18,7 @@
*/
import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
import Ubuntu.Components.ListItems 1.0 as ListItem
import Ubuntu.Components.Popups 1.0
import Ubuntu.MediaScanner 0.1
=== modified file 'music-app.qmltheme'
--- music-app.qmltheme 2015-06-27 20:18:02 +0000
+++ music-app.qmltheme 2015-08-27 23:24:02 +0000
@@ -1,5 +1,5 @@
@qml-mapping(.frame, , FrameDelegate);
-@qml-import(Ubuntu.Components 1.2);
+@qml-import(Ubuntu.Components 1.3);
.button {
color: "#c94212";
Follow ups
-
[Merge] lp:~vthompson/music-app/music-uc1.3 into lp:music-app
From: noreply, 2015-11-02
-
[Merge] lp:~vthompson/music-app/music-uc1.3 into lp:music-app
From: Andrew Hayzen, 2015-11-02
-
Re: [Merge] lp:~vthompson/music-app/music-uc1.3 into lp:music-app
From: Andrew Hayzen, 2015-11-02
-
Re: [Merge] lp:~vthompson/music-app/music-uc1.3 into lp:music-app
From: Ubuntu Phone Apps Jenkins Bot, 2015-10-31
-
Re: [Merge] lp:~vthompson/music-app/music-uc1.3 into lp:music-app
From: Ubuntu Phone Apps Jenkins Bot, 2015-10-31
-
Re: [Merge] lp:~vthompson/music-app/music-uc1.3 into lp:music-app
From: Ubuntu Phone Apps Jenkins Bot, 2015-10-24
-
Re: [Merge] lp:~vthompson/music-app/music-uc1.3 into lp:music-app
From: Ubuntu Phone Apps Jenkins Bot, 2015-10-24
-
Re: [Merge] lp:~vthompson/music-app/music-uc1.3 into lp:music-app
From: Ubuntu Phone Apps Jenkins Bot, 2015-10-23
-
Re: [Merge] lp:~vthompson/music-app/music-uc1.3 into lp:music-app
From: Ubuntu Phone Apps Jenkins Bot, 2015-10-23
-
Re: [Merge] lp:~vthompson/music-app/music-uc1.3 into lp:music-app
From: Andrew Hayzen, 2015-10-23
-
Re: [Merge] lp:~vthompson/music-app/music-uc1.3 into lp:music-app
From: Bartosz Kosiorek, 2015-10-23
-
Re: [Merge] lp:~vthompson/music-app/music-uc1.3 into lp:music-app
From: Ubuntu Phone Apps Jenkins Bot, 2015-10-23
-
Re: [Merge] lp:~vthompson/music-app/music-uc1.3 into lp:music-app
From: Victor Thompson, 2015-10-23
-
Re: [Merge] lp:~vthompson/music-app/music-uc1.3 into lp:music-app
From: Andrew Hayzen, 2015-10-22
-
Re: [Merge] lp:~vthompson/music-app/music-uc1.3 into lp:music-app
From: Bartosz Kosiorek, 2015-10-22
-
Re: [Merge] lp:~vthompson/music-app/music-uc1.3 into lp:music-app
From: Ubuntu Phone Apps Jenkins Bot, 2015-10-21
-
Re: [Merge] lp:~vthompson/music-app/music-uc1.3 into lp:music-app
From: Ubuntu Phone Apps Jenkins Bot, 2015-10-18
-
Re: [Merge] lp:~vthompson/music-app/music-uc1.3 into lp:music-app
From: Andrew Hayzen, 2015-10-09
-
Re: [Merge] lp:~vthompson/music-app/music-uc1.3 into lp:music-app
From: Ubuntu Phone Apps Jenkins Bot, 2015-08-28
-
Re: [Merge] lp:~vthompson/music-app/music-uc1.3 into lp:music-app
From: Victor Thompson, 2015-08-28
-
[Merge] lp:~vthompson/music-app/music-uc1.3 into lp:music-app
From: Victor Thompson, 2015-08-28
-
Re: [Merge] lp:~vthompson/music-app/music-uc1.3 into lp:music-app
From: Victor Thompson, 2015-08-28