Merge lp:~fboucault/tagger/migrate_toolkit_13 into lp:tagger

Proposed by Florian Boucault on 2016-01-18
Status: Merged
Merged at revision: 66
Proposed branch: lp:~fboucault/tagger/migrate_toolkit_13
Merge into: lp:tagger
Diff against target: 34 lines (+6/-6)
2 files modified
app/qml/PageWithBottomEdge.qml (+2/-2)
app/qml/tagger.qml (+4/-4)
To merge this branch: bzr merge lp:~fboucault/tagger/migrate_toolkit_13
Reviewer Review Type Date Requested Status
Michael Zanetti 2016-01-18 Pending
Review via email: mp+282912@code.launchpad.net

Commit message

Migrated to version 1.3 of the Ubuntu UI Toolkit

To post a comment you must log in.
66. By Florian Boucault on 2016-01-18

Tagged bug fix

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'app/qml/PageWithBottomEdge.qml'
2--- app/qml/PageWithBottomEdge.qml 2015-09-10 23:37:40 +0000
3+++ app/qml/PageWithBottomEdge.qml 2016-01-18 10:20:33 +0000
4@@ -62,8 +62,8 @@
5
6 */
7
8-import QtQuick 2.2
9-import Ubuntu.Components 1.2
10+import QtQuick 2.4
11+import Ubuntu.Components 1.3
12
13 Page {
14 id: page
15
16=== modified file 'app/qml/tagger.qml'
17--- app/qml/tagger.qml 2015-09-12 00:40:53 +0000
18+++ app/qml/tagger.qml 2016-01-18 10:20:33 +0000
19@@ -18,11 +18,11 @@
20 * *
21 ****************************************************************************/
22
23-import QtQuick 2.0
24+import QtQuick 2.4
25 import QtQuick.Layouts 1.1
26-import Ubuntu.Components 1.2
27-import Ubuntu.Components.ListItems 1.0
28-import Ubuntu.Components.Popups 1.0
29+import Ubuntu.Components 1.3
30+import Ubuntu.Components.ListItems 1.3
31+import Ubuntu.Components.Popups 1.3
32 import QtMultimedia 5.0
33 import QtQuick.Window 2.0
34 import Ubuntu.Content 0.1

Subscribers

People subscribed via source and target branches