← Back to team overview

ubuntu-touch-coreapps-reviewers team mailing list archive

[Merge] lp:~ken-vandine/music-app/lp1554621 into lp:music-app

 

Ken VanDine has proposed merging lp:~ken-vandine/music-app/lp1554621 into lp:music-app.

Commit message:
Bump Ubuntu.Content import to 1.3 to prevent mixed version imports


Requested reviews:
  Music App Developers (music-app-dev)
Related bugs:
  Bug #1554621 in Ubuntu Music App: "Invalid use of palette apparent with new SDK in content-hub"
  https://bugs.launchpad.net/music-app/+bug/1554621

For more details, see:
https://code.launchpad.net/~ken-vandine/music-app/lp1554621/+merge/289254

Bump Ubuntu.Content import to 1.3 to prevent mixed version imports

-- 
Your team Music App Developers is requested to review the proposed merge of lp:~ken-vandine/music-app/lp1554621 into lp:music-app.
=== modified file 'app/components/Helpers/ContentHubHelper.qml'
--- app/components/Helpers/ContentHubHelper.qml	2016-01-29 04:05:56 +0000
+++ app/components/Helpers/ContentHubHelper.qml	2016-03-16 16:54:16 +0000
@@ -20,7 +20,7 @@
 import QtQuick 2.4
 import Ubuntu.Components 1.3
 import Ubuntu.Components.Popups 1.3
-import Ubuntu.Content 1.1
+import Ubuntu.Content 1.3
 import "../../logic/stored-request.js" as StoredRequest
 
 

=== modified file 'app/ui/ContentHubExport.qml'
--- app/ui/ContentHubExport.qml	2016-02-26 03:16:35 +0000
+++ app/ui/ContentHubExport.qml	2016-03-16 16:54:16 +0000
@@ -18,7 +18,7 @@
 
 import QtQuick 2.4
 import Ubuntu.Components 1.3
-import Ubuntu.Content 1.1
+import Ubuntu.Content 1.3
 import Ubuntu.MediaScanner 0.1
 import Ubuntu.Thumbnailer 0.1
 


Follow ups