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

Proposed by Ken VanDine on 2016-03-16
Status: Merged
Approved by: Arto Jalkanen on 2016-03-21
Approved revision: 529
Merged at revision: 530
Proposed branch: lp:~ken-vandine/ubuntu-filemanager-app/lp1554621
Merge into: lp:ubuntu-filemanager-app
Diff against target: 37 lines (+3/-3)
3 files modified
src/app/qml/content-hub/FileOpener.qml (+1/-1)
src/app/qml/content-hub/contenttyperesolver.js (+1/-1)
src/app/qml/filemanager.qml (+1/-1)
To merge this branch: bzr merge lp:~ken-vandine/ubuntu-filemanager-app/lp1554621
Reviewer Review Type Date Requested Status
Jenkins Bot continuous-integration Approve on 2016-03-23
Arto Jalkanen 2016-03-16 Approve on 2016-03-21
Review via email: mp+289247@code.launchpad.net

Commit message

Bump Ubuntu.Content import to 1.3 to fix theme issue

Description of the change

Bump Ubuntu.Content import to 1.3 to fix theme issue

To post a comment you must log in.
Arto Jalkanen (ajalkane) :
review: Approve
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/app/qml/content-hub/FileOpener.qml'
2--- src/app/qml/content-hub/FileOpener.qml 2016-01-18 10:32:34 +0000
3+++ src/app/qml/content-hub/FileOpener.qml 2016-03-16 16:17:47 +0000
4@@ -18,7 +18,7 @@
5 import QtQuick 2.4
6 import Ubuntu.Components 1.3
7
8-import Ubuntu.Content 0.1
9+import Ubuntu.Content 1.3
10
11 import "contenttyperesolver.js" as Resolver
12
13
14=== modified file 'src/app/qml/content-hub/contenttyperesolver.js'
15--- src/app/qml/content-hub/contenttyperesolver.js 2015-12-03 12:10:42 +0000
16+++ src/app/qml/content-hub/contenttyperesolver.js 2016-03-16 16:17:47 +0000
17@@ -15,7 +15,7 @@
18 *
19 * Authored by: Arto Jalkanen <ajalkane@gmail.com>
20 */
21-.import Ubuntu.Content 0.1 as CH
22+.import Ubuntu.Content 1.3 as CH
23
24 /**
25 * For now a simple static mapping of file extensions to ContentHub types.
26
27=== modified file 'src/app/qml/filemanager.qml'
28--- src/app/qml/filemanager.qml 2016-02-02 00:35:27 +0000
29+++ src/app/qml/filemanager.qml 2016-03-16 16:17:47 +0000
30@@ -21,7 +21,7 @@
31 import Ubuntu.Components.Popups 1.3
32 import Ubuntu.Unity.Action 1.1 as UnityActions
33 import U1db 1.0 as U1db
34-import Ubuntu.Content 0.1
35+import Ubuntu.Content 1.3
36 import com.ubuntu.PlacesModel 0.1
37 import com.ubuntu.PamAuthentication 0.1
38

Subscribers

People subscribed via source and target branches