ubuntu-touch-coreapps-reviewers team mailing list archive

[Andrew Hayzen <ahayzen@xxxxxxxxx>]

Andrew Hayzen has proposed merging lp:~ahayzen/music-app/refactor-bump-framework-1504 into lp:music-app/refactor.

Commit message:
* Bump framework to 15.04 and apparmor policy version
* Bump QtQuick to 2.4 and UITK components to 1.2
* Remove useDeprecatedToolbar as it does not exist anymore

Requested reviews:
  Music App Developers (music-app-dev)

For more details, see:
https://code.launchpad.net/~ahayzen/music-app/refactor-bump-framework-1504/+merge/258126

* Bump framework to 15.04 and apparmor policy version
* Bump QtQuick to 2.4 and UITK components to 1.2
* Remove useDeprecatedToolbar as it does not exist anymore
-- 
Your team Music App Developers is requested to review the proposed merge of lp:~ahayzen/music-app/refactor-bump-framework-1504 into lp:music-app/refactor.

=== modified file 'app/components/BlurredBackground.qml'
--- app/components/BlurredBackground.qml	2015-02-03 15:23:45 +0000
+++ app/components/BlurredBackground.qml	2015-05-03 15:15:34 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013, 2014
+ * Copyright (C) 2013, 2014, 2015
  *      Andrew Hayzen <ahayzen@xxxxxxxxx>
  *      Daniel Holm <d.holmen@xxxxxxxxx>
  *      Victor Thompson <victor.thompson@xxxxxxxxx>
@@ -17,8 +17,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.3
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.2
 import QtGraphicalEffects 1.0
 
 // Blurred background

=== modified file 'app/components/BlurredHeader.qml'
--- app/components/BlurredHeader.qml	2015-04-28 17:37:33 +0000
+++ app/components/BlurredHeader.qml	2015-05-03 15:15:34 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014
+ * Copyright (C) 2014, 2015
  *      Andrew Hayzen <ahayzen@xxxxxxxxx>
  *      Victor Thompson <victor.thompson@xxxxxxxxx>
  *
@@ -16,8 +16,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.3
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.2
 import Ubuntu.Components.ListItems 1.0 as ListItem
 
 ListItem.Standard {

=== modified file 'app/components/ColumnFlow.qml'
--- app/components/ColumnFlow.qml	2015-05-02 17:43:03 +0000
+++ app/components/ColumnFlow.qml	2015-05-03 15:15:34 +0000
@@ -15,7 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.3
+import QtQuick 2.4
 
 Item {
     id: columnFlow

=== modified file 'app/components/CoverGrid.qml'
--- app/components/CoverGrid.qml	2015-02-03 15:23:45 +0000
+++ app/components/CoverGrid.qml	2015-05-03 15:15:34 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013, 2014
+ * Copyright (C) 2013, 2014, 2015
  *      Andrew Hayzen <ahayzen@xxxxxxxxx>
  *      Nekhelesh Ramananthan <krnekhelesh@xxxxxxxxx>
  *      Victor Thompson <victor.thompson@xxxxxxxxx>
@@ -17,8 +17,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.3
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.2
 
 Item {
     id: coverGrid

=== modified file 'app/components/Delegates/Card.qml'
--- app/components/Delegates/Card.qml	2015-02-16 20:27:40 +0000
+++ app/components/Delegates/Card.qml	2015-05-03 15:15:34 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014
+ * Copyright (C) 2014, 2015
  *      Andrew Hayzen <ahayzen@xxxxxxxxx>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -15,8 +15,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.3
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.2
 import "../"
 
 

=== modified file 'app/components/Delegates/ListItemWithActions.qml'
--- app/components/Delegates/ListItemWithActions.qml	2015-04-28 17:37:33 +0000
+++ app/components/Delegates/ListItemWithActions.qml	2015-05-03 15:15:34 +0000
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.3
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.2
 import Ubuntu.Components.ListItems 1.0 as ListItem
 
 

=== modified file 'app/components/Delegates/MusicListItem.qml'
--- app/components/Delegates/MusicListItem.qml	2015-02-22 02:24:16 +0000
+++ app/components/Delegates/MusicListItem.qml	2015-05-03 15:15:34 +0000
@@ -17,8 +17,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.3
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.2
 import "../"
 
 

=== modified file 'app/components/Dialog/ContentHubErrorDialog.qml'
--- app/components/Dialog/ContentHubErrorDialog.qml	2015-02-04 20:26:23 +0000
+++ app/components/Dialog/ContentHubErrorDialog.qml	2015-05-03 15:15:34 +0000
@@ -17,8 +17,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.3
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.2
 import Ubuntu.Components.Popups 1.0
 
 Dialog {

=== modified file 'app/components/Dialog/ContentHubNotFoundDialog.qml'
--- app/components/Dialog/ContentHubNotFoundDialog.qml	2015-02-04 20:26:23 +0000
+++ app/components/Dialog/ContentHubNotFoundDialog.qml	2015-05-03 15:15:34 +0000
@@ -17,8 +17,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.3
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.2
 import Ubuntu.Components.Popups 1.0
 
 Dialog {

=== modified file 'app/components/Dialog/ContentHubWaitDialog.qml'
--- app/components/Dialog/ContentHubWaitDialog.qml	2015-02-05 22:49:12 +0000
+++ app/components/Dialog/ContentHubWaitDialog.qml	2015-05-03 15:15:34 +0000
@@ -17,8 +17,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.3
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.2
 import Ubuntu.Components.Popups 1.0
 import "../"
 

=== modified file 'app/components/Dialog/EditPlaylistDialog.qml'
--- app/components/Dialog/EditPlaylistDialog.qml	2015-03-24 03:53:15 +0000
+++ app/components/Dialog/EditPlaylistDialog.qml	2015-05-03 15:15:34 +0000
@@ -17,8 +17,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.3
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.2
 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-03-24 03:53:15 +0000
+++ app/components/Dialog/NewPlaylistDialog.qml	2015-05-03 15:15:34 +0000
@@ -17,8 +17,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.3
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.2
 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-04-28 17:57:13 +0000
+++ app/components/Dialog/RemovePlaylistDialog.qml	2015-05-03 15:15:34 +0000
@@ -17,8 +17,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.3
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.2
 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-02-08 04:06:28 +0000
+++ app/components/Flickables/CardView.qml	2015-05-03 15:15:34 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014
+ * Copyright (C) 2014, 2015
  *      Andrew Hayzen <ahayzen@xxxxxxxxx>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -15,8 +15,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.3
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.2
 import "../"
 
 

=== modified file 'app/components/Flickables/MultiSelectListView.qml'
--- app/components/Flickables/MultiSelectListView.qml	2015-02-08 04:06:28 +0000
+++ app/components/Flickables/MultiSelectListView.qml	2015-05-03 15:15:34 +0000
@@ -17,8 +17,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.3
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.2
 
 MusicListView {
     property var selectedItems: []

=== modified file 'app/components/Flickables/MusicListView.qml'
--- app/components/Flickables/MusicListView.qml	2015-02-08 04:06:28 +0000
+++ app/components/Flickables/MusicListView.qml	2015-05-03 15:15:34 +0000
@@ -17,8 +17,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.3
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.2
 
 
 ListView {

=== modified file 'app/components/HeadState/MultiSelectHeadState.qml'
--- app/components/HeadState/MultiSelectHeadState.qml	2015-02-14 18:35:11 +0000
+++ app/components/HeadState/MultiSelectHeadState.qml	2015-05-03 15:15:34 +0000
@@ -16,8 +16,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.3
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.2
 
 PageHeadState {
     id: selectionState

=== modified file 'app/components/HeadState/PlaylistsHeadState.qml'
--- app/components/HeadState/PlaylistsHeadState.qml	2015-03-24 23:57:29 +0000
+++ app/components/HeadState/PlaylistsHeadState.qml	2015-05-03 15:15:34 +0000
@@ -16,8 +16,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.3
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.2
 import Ubuntu.Components.Popups 1.0
 
 

=== modified file 'app/components/HeadState/SearchHeadState.qml'
--- app/components/HeadState/SearchHeadState.qml	2015-02-04 19:54:19 +0000
+++ app/components/HeadState/SearchHeadState.qml	2015-05-03 15:15:34 +0000
@@ -16,8 +16,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.3
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.2
 
 PageHeadState {
     id: headerState

=== modified file 'app/components/HeadState/SearchableHeadState.qml'
--- app/components/HeadState/SearchableHeadState.qml	2015-02-05 02:33:53 +0000
+++ app/components/HeadState/SearchableHeadState.qml	2015-05-03 15:15:34 +0000
@@ -16,8 +16,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.3
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.2
 
 
 PageHeadState {

=== modified file 'app/components/Helpers/ContentHubHelper.qml'
--- app/components/Helpers/ContentHubHelper.qml	2015-04-06 17:06:50 +0000
+++ app/components/Helpers/ContentHubHelper.qml	2015-05-03 15:15:34 +0000
@@ -17,8 +17,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.3
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.2
 import Ubuntu.Components.Popups 1.0
 import Ubuntu.Content 0.1
 import "../../logic/stored-request.js" as StoredRequest

=== modified file 'app/components/Helpers/UriHandlerHelper.qml'
--- app/components/Helpers/UriHandlerHelper.qml	2015-04-06 17:06:50 +0000
+++ app/components/Helpers/UriHandlerHelper.qml	2015-05-03 15:15:34 +0000
@@ -17,8 +17,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.3
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.2
 import "../"
 import "../../logic/stored-request.js" as StoredRequest
 

=== modified file 'app/components/Helpers/UserMetricsHelper.qml'
--- app/components/Helpers/UserMetricsHelper.qml	2015-03-09 00:13:22 +0000
+++ app/components/Helpers/UserMetricsHelper.qml	2015-05-03 15:15:34 +0000
@@ -17,8 +17,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.3
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.2
 import UserMetrics 0.1
 
 

=== modified file 'app/components/LibraryListModel.qml'
--- app/components/LibraryListModel.qml	2015-02-03 23:00:14 +0000
+++ app/components/LibraryListModel.qml	2015-05-03 15:15:34 +0000
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.3
+import QtQuick 2.4
 import QtQuick.LocalStorage 2.0
 import "../logic/meta-database.js" as Library
 import "../logic/playlists.js" as Playlists

=== modified file 'app/components/ListItemActions/AddToPlaylist.qml'
--- app/components/ListItemActions/AddToPlaylist.qml	2015-02-22 02:22:22 +0000
+++ app/components/ListItemActions/AddToPlaylist.qml	2015-05-03 15:15:34 +0000
@@ -17,8 +17,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.3
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.2
 
 Action {
     iconName: "add-to-playlist"

=== modified file 'app/components/ListItemActions/AddToQueue.qml'
--- app/components/ListItemActions/AddToQueue.qml	2015-02-03 23:00:14 +0000
+++ app/components/ListItemActions/AddToQueue.qml	2015-05-03 15:15:34 +0000
@@ -1,7 +1,8 @@
 /*
- * Copyright (C) 2014 Andrew Hayzen <ahayzen@xxxxxxxxx>
- *                    Daniel Holm <d.holmen@xxxxxxxxx>
- *                    Victor Thompson <victor.thompson@xxxxxxxxx>
+ * Copyright (C) 2014, 2015
+ *      Andrew Hayzen <ahayzen@xxxxxxxxx>
+ *      Daniel Holm <d.holmen@xxxxxxxxx>
+ *      Victor Thompson <victor.thompson@xxxxxxxxx>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -16,9 +17,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.3
+import QtQuick 2.4
 import QtQuick.LocalStorage 2.0
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.2
 import "../../logic/meta-database.js" as Library
 
 Action {

=== modified file 'app/components/ListItemActions/CheckBox.qml'
--- app/components/ListItemActions/CheckBox.qml	2014-10-21 16:03:44 +0000
+++ app/components/ListItemActions/CheckBox.qml	2015-05-03 15:15:34 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2014 Canonical, Ltd.
+ * Copyright (C) 2012-2015 Canonical, Ltd.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.2
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.2
 
 CheckBox {
     checked: root.selected

=== modified file 'app/components/ListItemActions/Remove.qml'
--- app/components/ListItemActions/Remove.qml	2015-02-22 02:22:22 +0000
+++ app/components/ListItemActions/Remove.qml	2015-05-03 15:15:34 +0000
@@ -1,7 +1,8 @@
 /*
- * Copyright (C) 2014 Andrew Hayzen <ahayzen@xxxxxxxxx>
- *                    Daniel Holm <d.holmen@xxxxxxxxx>
- *                    Victor Thompson <victor.thompson@xxxxxxxxx>
+ * Copyright (C) 2014, 2015
+ *      Andrew Hayzen <ahayzen@xxxxxxxxx>
+ *      Daniel Holm <d.holmen@xxxxxxxxx>
+ *      Victor Thompson <victor.thompson@xxxxxxxxx>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -16,8 +17,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.3
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.2
 import Ubuntu.Components.Popups 1.0
 
 Action {

=== modified file 'app/components/ListItemReorderComponent.qml'
--- app/components/ListItemReorderComponent.qml	2015-03-06 02:38:56 +0000
+++ app/components/ListItemReorderComponent.qml	2015-05-03 15:15:34 +0000
@@ -17,8 +17,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.3
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.2
 
 
 Item {

=== modified file 'app/components/LoadingSpinnerComponent.qml'
--- app/components/LoadingSpinnerComponent.qml	2014-09-20 10:50:45 +0000
+++ app/components/LoadingSpinnerComponent.qml	2015-05-03 15:15:34 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013 Canonical Ltd
+ * Copyright (C) 2013, 2015 Canonical Ltd
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
@@ -17,8 +17,8 @@
  *              Martin Borho <martin@xxxxxxxxx>
  *              Andrew Starr-Bochicchio <a.starr.b@xxxxxxxxx>
  */
-import QtQuick 2.3
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.2
 
 Item {
     id: refresh

=== modified file 'app/components/MusicPage.qml'
--- app/components/MusicPage.qml	2015-03-24 23:57:29 +0000
+++ app/components/MusicPage.qml	2015-05-03 15:15:34 +0000
@@ -17,8 +17,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.3
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.2
 import Ubuntu.Components.Popups 1.0
 
 

=== modified file 'app/components/MusicRow.qml'
--- app/components/MusicRow.qml	2015-02-03 15:23:45 +0000
+++ app/components/MusicRow.qml	2015-05-03 15:15:34 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013, 2014
+ * Copyright (C) 2013, 2014, 2015
  *      Andrew Hayzen <ahayzen@xxxxxxxxx>
  *      Nekhelesh Ramananthan <krnekhelesh@xxxxxxxxx>
  *      Victor Thompson <victor.thompson@xxxxxxxxx>
@@ -17,8 +17,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.3
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.2
 
 
 Row {

=== modified file 'app/components/MusicToolbar.qml'
--- app/components/MusicToolbar.qml	2015-02-04 16:43:17 +0000
+++ app/components/MusicToolbar.qml	2015-05-03 15:15:34 +0000
@@ -17,9 +17,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.3
+import QtQuick 2.4
 import QtMultimedia 5.0
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.2
 
 Rectangle {
     anchors {

=== modified file 'app/components/NowPlayingFullView.qml'
--- app/components/NowPlayingFullView.qml	2015-02-14 18:35:11 +0000
+++ app/components/NowPlayingFullView.qml	2015-05-03 15:15:34 +0000
@@ -17,8 +17,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.3
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.2
 import Ubuntu.Thumbnailer 0.1
 import "../components/Themes/Ambiance"
 

=== modified file 'app/components/NowPlayingToolbar.qml'
--- app/components/NowPlayingToolbar.qml	2015-02-14 18:35:11 +0000
+++ app/components/NowPlayingToolbar.qml	2015-05-03 15:15:34 +0000
@@ -18,8 +18,8 @@
  */
 
 import QtMultimedia 5.0
-import QtQuick 2.3
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.2
 
 
 /* Full toolbar */

=== modified file 'app/components/Player.qml'
--- app/components/Player.qml	2015-04-29 01:12:57 +0000
+++ app/components/Player.qml	2015-05-03 15:15:34 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013, 2014
+ * Copyright (C) 2013, 2014, 2015
  *      Andrew Hayzen <ahayzen@xxxxxxxxx>
  *      Daniel Holm <d.holmen@xxxxxxxxx>
  *      Victor Thompson <victor.thompson@xxxxxxxxx>
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.3
+import QtQuick 2.4
 import QtMultimedia 5.0
 import QtQuick.LocalStorage 2.0
 import Qt.labs.settings 1.0

=== modified file 'app/components/PlaylistsEmptyState.qml'
--- app/components/PlaylistsEmptyState.qml	2015-02-05 03:03:40 +0000
+++ app/components/PlaylistsEmptyState.qml	2015-05-03 15:15:34 +0000
@@ -17,8 +17,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.3
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.2
 
 
 Rectangle {

=== modified file 'app/components/Queue.qml'
--- app/components/Queue.qml	2015-03-06 00:29:15 +0000
+++ app/components/Queue.qml	2015-05-03 15:15:34 +0000
@@ -17,8 +17,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.3
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.2
 import "Delegates"
 import "Flickables"
 import "ListItemActions"

=== modified file 'app/components/Style.qml'
--- app/components/Style.qml	2015-02-03 23:00:14 +0000
+++ app/components/Style.qml	2015-05-03 15:15:34 +0000
@@ -17,8 +17,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.3
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.2
 
 
 QtObject {

=== modified file 'app/components/ViewButton/PlayAllButton.qml'
--- app/components/ViewButton/PlayAllButton.qml	2015-02-06 03:53:48 +0000
+++ app/components/ViewButton/PlayAllButton.qml	2015-05-03 15:15:34 +0000
@@ -17,8 +17,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.3
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.2
 
 
 Button {

=== modified file 'app/components/ViewButton/QueueAllButton.qml'
--- app/components/ViewButton/QueueAllButton.qml	2015-02-06 03:53:48 +0000
+++ app/components/ViewButton/QueueAllButton.qml	2015-05-03 15:15:34 +0000
@@ -17,8 +17,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.3
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.2
 
 
 Button {

=== modified file 'app/components/ViewButton/ShuffleButton.qml'
--- app/components/ViewButton/ShuffleButton.qml	2015-02-06 03:53:48 +0000
+++ app/components/ViewButton/ShuffleButton.qml	2015-05-03 15:15:34 +0000
@@ -17,8 +17,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.3
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.2
 
 
 Button {

=== modified file 'app/components/Walkthrough/FirstRunWalkthrough.qml'
--- app/components/Walkthrough/FirstRunWalkthrough.qml	2015-03-25 00:11:50 +0000
+++ app/components/Walkthrough/FirstRunWalkthrough.qml	2015-05-03 15:15:34 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014
+ * Copyright (C) 2014, 2015
  *      Nekhelesh Ramananthan <nik90@xxxxxxxxxx>
  *      Victor Thompson <victor.thompson@xxxxxxxxx>
  *
@@ -19,8 +19,8 @@
  * https://github.com/krnekhelesh/flashback
  */
 
-import QtQuick 2.3
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.2
 
 // Initial Walkthrough tutorial
 Walkthrough {

=== modified file 'app/components/Walkthrough/Slide1.qml'
--- app/components/Walkthrough/Slide1.qml	2015-02-03 15:23:45 +0000
+++ app/components/Walkthrough/Slide1.qml	2015-05-03 15:15:34 +0000
@@ -20,8 +20,8 @@
  * https://github.com/krnekhelesh/flashback
  */
 
-import QtQuick 2.3
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.2
 
 // Slide 1
 Component {

=== modified file 'app/components/Walkthrough/Slide2.qml'
--- app/components/Walkthrough/Slide2.qml	2015-02-03 15:23:45 +0000
+++ app/components/Walkthrough/Slide2.qml	2015-05-03 15:15:34 +0000
@@ -20,8 +20,8 @@
  * https://github.com/krnekhelesh/flashback
  */
 
-import QtQuick 2.3
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.2
 
 // Walkthrough - Slide 2
 Component {

=== modified file 'app/components/Walkthrough/Slide3.qml'
--- app/components/Walkthrough/Slide3.qml	2015-02-03 15:23:45 +0000
+++ app/components/Walkthrough/Slide3.qml	2015-05-03 15:15:34 +0000
@@ -20,8 +20,8 @@
  * https://github.com/krnekhelesh/flashback
  */
 
-import QtQuick 2.3
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.2
 
 // Walkthrough - Slide 7
 Component {

=== modified file 'app/components/Walkthrough/Walkthrough.qml'
--- app/components/Walkthrough/Walkthrough.qml	2015-02-03 15:23:45 +0000
+++ app/components/Walkthrough/Walkthrough.qml	2015-05-03 15:15:34 +0000
@@ -20,8 +20,8 @@
  * https://github.com/krnekhelesh/flashback
  */
 
-import QtQuick 2.3
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.2
 import Ubuntu.Components.ListItems 1.0 as ListItem
 
 Page {

=== modified file 'app/components/WorkerModelLoader.qml'
--- app/components/WorkerModelLoader.qml	2015-02-03 23:00:14 +0000
+++ app/components/WorkerModelLoader.qml	2015-05-03 15:15:34 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014
+ * Copyright (C) 2014, 2015
  *      Andrew Hayzen <ahayzen@xxxxxxxxx>
  *      Victor Thompson <victor.thompson@xxxxxxxxx>
  *
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.3
+import QtQuick 2.4
 
 
 WorkerScript {

=== modified file 'app/components/WorkerWaiter.qml'
--- app/components/WorkerWaiter.qml	2015-02-16 20:51:18 +0000
+++ app/components/WorkerWaiter.qml	2015-05-03 15:15:34 +0000
@@ -17,8 +17,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.3
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.2
 
 
 Timer {  // A timer to wait for a worker to stop

=== modified file 'app/music-app.qml'
--- app/music-app.qml	2015-04-29 00:55:02 +0000
+++ app/music-app.qml	2015-05-03 15:15:34 +0000
@@ -17,8 +17,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.3
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.2
 import Ubuntu.Components.Popups 1.0
 import Ubuntu.MediaScanner 0.1
 import Qt.labs.settings 1.0
@@ -36,7 +36,6 @@
     objectName: "music"
     applicationName: "com.ubuntu.music"
     id: mainView
-    useDeprecatedToolbar: false
 
     backgroundColor: styleMusic.mainView.backgroundColor
     headerColor: styleMusic.mainView.headerColor

=== modified file 'app/ui/AddToPlaylist.qml'
--- app/ui/AddToPlaylist.qml	2015-02-16 20:27:40 +0000
+++ app/ui/AddToPlaylist.qml	2015-05-03 15:15:34 +0000
@@ -18,8 +18,8 @@
  */
 
 import QtMultimedia 5.0
-import QtQuick 2.3
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.2
 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-02-16 20:27:40 +0000
+++ app/ui/Albums.qml	2015-05-03 15:15:34 +0000
@@ -17,8 +17,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.3
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.2
 import Ubuntu.MediaScanner 0.1
 import "../components"
 import "../components/Delegates"

=== modified file 'app/ui/ArtistView.qml'
--- app/ui/ArtistView.qml	2015-04-28 17:37:33 +0000
+++ app/ui/ArtistView.qml	2015-05-03 15:15:34 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013, 2014
+ * Copyright (C) 2013, 2014, 2015
  *      Andrew Hayzen <ahayzen@xxxxxxxxx>
  *      Daniel Holm <d.holmen@xxxxxxxxx>
  *      Victor Thompson <victor.thompson@xxxxxxxxx>
@@ -17,8 +17,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.3
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.2
 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-02-16 20:27:40 +0000
+++ app/ui/Artists.qml	2015-05-03 15:15:34 +0000
@@ -17,8 +17,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.3
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.2
 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-02-16 20:27:40 +0000
+++ app/ui/Genres.qml	2015-05-03 15:15:34 +0000
@@ -17,8 +17,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.3
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.2
 import Ubuntu.MediaScanner 0.1
 import "../components"
 import "../components/Delegates"

=== modified file 'app/ui/LibraryEmptyState.qml'
--- app/ui/LibraryEmptyState.qml	2015-02-05 03:12:47 +0000
+++ app/ui/LibraryEmptyState.qml	2015-05-03 15:15:34 +0000
@@ -17,8 +17,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.3
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.2
 
 Page {
     id: libraryEmptyPage

=== modified file 'app/ui/NowPlaying.qml'
--- app/ui/NowPlaying.qml	2015-03-25 00:11:50 +0000
+++ app/ui/NowPlaying.qml	2015-05-03 15:15:34 +0000
@@ -17,9 +17,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.3
+import QtQuick 2.4
 import QtQuick.LocalStorage 2.0
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.2
 import "../components"
 import "../components/HeadState"
 import "../logic/meta-database.js" as Library

=== modified file 'app/ui/Playlists.qml'
--- app/ui/Playlists.qml	2015-04-28 17:37:33 +0000
+++ app/ui/Playlists.qml	2015-05-03 15:15:34 +0000
@@ -18,8 +18,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.3
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.2
 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-02-16 20:27:40 +0000
+++ app/ui/Recent.qml	2015-05-03 15:15:34 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013, 2014
+ * Copyright (C) 2013, 2014, 2015
  *      Andrew Hayzen <ahayzen@xxxxxxxxx>
  *      Daniel Holm <d.holmen@xxxxxxxxx>
  *      Victor Thompson <victor.thompson@xxxxxxxxx>
@@ -17,8 +17,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.3
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.2
 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-02-16 20:27:40 +0000
+++ app/ui/Songs.qml	2015-05-03 15:15:34 +0000
@@ -17,8 +17,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.3
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.2
 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-04-28 17:37:33 +0000
+++ app/ui/SongsView.qml	2015-05-03 15:15:34 +0000
@@ -17,8 +17,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.3
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.2
 import Ubuntu.Components.ListItems 1.0 as ListItem
 import Ubuntu.Components.Popups 1.0
 import Ubuntu.MediaScanner 0.1

=== modified file 'apparmor.json'
--- apparmor.json	2015-01-28 17:45:43 +0000
+++ apparmor.json	2015-05-03 15:15:34 +0000
@@ -1,5 +1,5 @@
 {
-    "policy_version": 1.2,
+    "policy_version": 1.3,
     "policy_groups": [
         "audio",
         "content_exchange",
@@ -15,4 +15,4 @@
     "write_path": [
         "@{HOME}/Music/Imported/"
     ]
-}
+}
\ No newline at end of file

=== modified file 'manifest.json.in'
--- manifest.json.in	2015-01-28 17:45:43 +0000
+++ manifest.json.in	2015-05-03 15:15:34 +0000
@@ -1,7 +1,7 @@
 {
     "architecture": "all",
     "description": "A music application for ubuntu",
-    "framework": "ubuntu-sdk-14.10-qml",
+    "framework": "ubuntu-sdk-15.04-qml",
     "hooks": {
         "music": {
             "apparmor": "apparmor.json",