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

Proposed by Florian Boucault
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 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

Tagged bug fix

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'app/qml/PageWithBottomEdge.qml'
--- app/qml/PageWithBottomEdge.qml 2015-09-10 23:37:40 +0000
+++ app/qml/PageWithBottomEdge.qml 2016-01-18 10:20:33 +0000
@@ -62,8 +62,8 @@
6262
63*/63*/
6464
65import QtQuick 2.265import QtQuick 2.4
66import Ubuntu.Components 1.266import Ubuntu.Components 1.3
6767
68Page {68Page {
69 id: page69 id: page
7070
=== modified file 'app/qml/tagger.qml'
--- app/qml/tagger.qml 2015-09-12 00:40:53 +0000
+++ app/qml/tagger.qml 2016-01-18 10:20:33 +0000
@@ -18,11 +18,11 @@
18 * *18 * *
19 ****************************************************************************/19 ****************************************************************************/
2020
21import QtQuick 2.021import QtQuick 2.4
22import QtQuick.Layouts 1.122import QtQuick.Layouts 1.1
23import Ubuntu.Components 1.223import Ubuntu.Components 1.3
24import Ubuntu.Components.ListItems 1.024import Ubuntu.Components.ListItems 1.3
25import Ubuntu.Components.Popups 1.025import Ubuntu.Components.Popups 1.3
26import QtMultimedia 5.026import QtMultimedia 5.0
27import QtQuick.Window 2.027import QtQuick.Window 2.0
28import Ubuntu.Content 0.128import Ubuntu.Content 0.1

Subscribers

People subscribed via source and target branches