← Back to team overview

ubuntu-touch-coreapps-reviewers team mailing list archive

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

 

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

Commit message:
Bump Ubuntu.Content import to 1.3 to fix theme issue


Requested reviews:
  Ubuntu File Manager Developers (ubuntu-filemanager-dev)
Related bugs:
  Bug #1554621 in content-hub (Ubuntu): "Invalid use of palette apparent with new SDK in content-hub"
  https://bugs.launchpad.net/ubuntu/+source/content-hub/+bug/1554621

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

Bump Ubuntu.Content import to 1.3 to fix theme issue

-- 
Your team Ubuntu File Manager Developers is requested to review the proposed merge of lp:~ken-vandine/ubuntu-filemanager-app/lp1554621 into lp:ubuntu-filemanager-app.
=== modified file 'src/app/qml/content-hub/FileOpener.qml'
--- src/app/qml/content-hub/FileOpener.qml	2016-01-18 10:32:34 +0000
+++ src/app/qml/content-hub/FileOpener.qml	2016-03-16 16:17:47 +0000
@@ -18,7 +18,7 @@
 import QtQuick 2.4
 import Ubuntu.Components 1.3
 
-import Ubuntu.Content 0.1
+import Ubuntu.Content 1.3
 
 import "contenttyperesolver.js" as Resolver
 

=== modified file 'src/app/qml/content-hub/contenttyperesolver.js'
--- src/app/qml/content-hub/contenttyperesolver.js	2015-12-03 12:10:42 +0000
+++ src/app/qml/content-hub/contenttyperesolver.js	2016-03-16 16:17:47 +0000
@@ -15,7 +15,7 @@
  *
  * Authored by: Arto Jalkanen <ajalkane@xxxxxxxxx>
  */
-.import Ubuntu.Content 0.1 as CH
+.import Ubuntu.Content 1.3 as CH
 
 /**
  * For now a simple static mapping of file extensions to ContentHub types.

=== modified file 'src/app/qml/filemanager.qml'
--- src/app/qml/filemanager.qml	2016-02-02 00:35:27 +0000
+++ src/app/qml/filemanager.qml	2016-03-16 16:17:47 +0000
@@ -21,7 +21,7 @@
 import Ubuntu.Components.Popups 1.3
 import Ubuntu.Unity.Action 1.1 as UnityActions
 import U1db 1.0 as U1db
-import Ubuntu.Content 0.1
+import Ubuntu.Content 1.3
 import com.ubuntu.PlacesModel 0.1
 import com.ubuntu.PamAuthentication 0.1
 


Follow ups