← Back to team overview

ubuntu-touch-coreapps-reviewers team mailing list archive

[Merge] lp:~ahayzen/music-app/media-hub-bg-playlists-rework-qt-56 into lp:~music-app-dev/music-app/media-hub-bg-playlists-rework

 

Andrew Hayzen has proposed merging lp:~ahayzen/music-app/media-hub-bg-playlists-rework-qt-56 into lp:~music-app-dev/music-app/media-hub-bg-playlists-rework.

Commit message:
* Bump QtMultimedia import to 5.6 and remove unused ones

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

For more details, see:
https://code.launchpad.net/~ahayzen/music-app/media-hub-bg-playlists-rework-qt-56/+merge/281145

* Bump QtMultimedia import to 5.6 and remove unused ones

Separate branch, as this isn't yet in the repositories :-)
-- 
Your team Music App Developers is requested to review the proposed merge of lp:~ahayzen/music-app/media-hub-bg-playlists-rework-qt-56 into lp:~music-app-dev/music-app/media-hub-bg-playlists-rework.
=== modified file 'app/components/NewPlayer.qml'
--- app/components/NewPlayer.qml	2015-12-17 02:14:38 +0000
+++ app/components/NewPlayer.qml	2015-12-21 20:10:14 +0000
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtMultimedia 5.4
+import QtMultimedia 5.6
 import QtQuick 2.4
 import Qt.labs.settings 1.0
 

=== modified file 'app/components/NowPlayingToolbar.qml'
--- app/components/NowPlayingToolbar.qml	2015-11-23 02:08:11 +0000
+++ app/components/NowPlayingToolbar.qml	2015-12-21 20:10:14 +0000
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtMultimedia 5.0
+import QtMultimedia 5.6
 import QtQuick 2.4
 import Ubuntu.Components 1.3
 

=== modified file 'app/music-app.qml'
--- app/music-app.qml	2015-12-17 02:14:38 +0000
+++ app/music-app.qml	2015-12-21 20:10:14 +0000
@@ -22,7 +22,7 @@
 import Ubuntu.Components.Popups 1.3
 import Ubuntu.MediaScanner 0.1
 import Qt.labs.settings 1.0
-import QtMultimedia 5.0
+import QtMultimedia 5.6
 import QtQuick.LocalStorage 2.0
 import QtGraphicalEffects 1.0
 import "logic/stored-request.js" as StoredRequest

=== modified file 'app/ui/AddToPlaylist.qml'
--- app/ui/AddToPlaylist.qml	2015-10-28 01:05:33 +0000
+++ app/ui/AddToPlaylist.qml	2015-12-21 20:10:14 +0000
@@ -17,7 +17,6 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtMultimedia 5.0
 import QtQuick 2.4
 import Ubuntu.Components 1.3
 import QtQuick.LocalStorage 2.0

=== modified file 'app/ui/Playlists.qml'
--- app/ui/Playlists.qml	2015-10-28 01:05:33 +0000
+++ app/ui/Playlists.qml	2015-12-21 20:10:14 +0000
@@ -20,7 +20,6 @@
 
 import QtQuick 2.4
 import Ubuntu.Components 1.3
-import QtMultimedia 5.0
 import QtQuick.LocalStorage 2.0
 import "../logic/playlists.js" as Playlists
 import "../components"

=== modified file 'app/ui/Recent.qml'
--- app/ui/Recent.qml	2015-10-28 01:05:33 +0000
+++ app/ui/Recent.qml	2015-12-21 20:10:14 +0000
@@ -21,7 +21,6 @@
 import Ubuntu.Components 1.3
 import Ubuntu.MediaScanner 0.1
 import Ubuntu.Thumbnailer 0.1
-import QtMultimedia 5.0
 import QtQuick.LocalStorage 2.0
 import "../logic/meta-database.js" as Library
 import "../logic/playlists.js" as Playlists

=== modified file 'app/ui/Songs.qml'
--- app/ui/Songs.qml	2015-12-17 02:14:38 +0000
+++ app/ui/Songs.qml	2015-12-21 20:10:14 +0000
@@ -21,7 +21,6 @@
 import Ubuntu.Components 1.3
 import Ubuntu.MediaScanner 0.1
 import Ubuntu.Thumbnailer 0.1
-import QtMultimedia 5.0
 import QtQuick.LocalStorage 2.0
 import "../logic/playlists.js" as Playlists
 import "../components"