ubuntuone-credentials

Merge lp:~mzanetti/ubuntuone-credentials/update-to-uitk-1.3 into lp:ubuntuone-credentials

  1. update-to-uitk-1.3
  2. Merge into trunk
Proposed by Michael Zanetti
Status: Merged
Approved by: dobey
Approved revision: 230
Merged at revision: 230
Proposed branch: lp:~mzanetti/ubuntuone-credentials/update-to-uitk-1.3
Merge into: lp:ubuntuone-credentials
Diff against target: 78 lines (+12/-12)
5 files modified
online-accounts-provider/ExistingAccount.qml (+4/-4)
online-accounts-provider/LoginForm.qml (+2/-2)
online-accounts-provider/Main.qml (+2/-2)
online-accounts-provider/NewAccount.qml (+2/-2)
online-accounts-provider/RegisterForm.qml (+2/-2)
To merge this branch: bzr merge lp:~mzanetti/ubuntuone-credentials/update-to-uitk-1.3
Reviewer Review Type Date Requested Status
dobey (community) Approve
Review via email: mp+289647@code.launchpad.net

Commit message

update to uitk 1.3

To post a comment you must log in.
Revision history for this message
dobey (dobey) wrote :

Can you please link bug #1560621 with bzr commit --unchanged --fixes=lp:1560621 so that this is linked to a bug report?

Otherwise, looks OK.

review: Needs Fixing
Revision history for this message
dobey (dobey) wrote :

Approving this to get it landed.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'online-accounts-provider/ExistingAccount.qml'
2--- online-accounts-provider/ExistingAccount.qml 2014-08-01 19:53:01 +0000
3+++ online-accounts-provider/ExistingAccount.qml 2016-03-21 14:53:55 +0000
4@@ -15,10 +15,10 @@
5 * with this program. If not, see <http://www.gnu.org/licenses/>.
6 */
7
8-import QtQuick 2.0
9-import Ubuntu.Components 0.1
10-import Ubuntu.Components.ListItems 0.1 as ListItem
11-import Ubuntu.Components.Popups 0.1
12+import QtQuick 2.4
13+import Ubuntu.Components 1.3
14+import Ubuntu.Components.ListItems 1.3 as ListItem
15+import Ubuntu.Components.Popups 1.3
16 import Ubuntu.OnlineAccounts 0.1
17 import Ubuntu.OnlineAccounts.Plugin 1.0
18
19
20=== modified file 'online-accounts-provider/LoginForm.qml'
21--- online-accounts-provider/LoginForm.qml 2014-09-06 11:16:38 +0000
22+++ online-accounts-provider/LoginForm.qml 2016-03-21 14:53:55 +0000
23@@ -14,8 +14,8 @@
24 * You should have received a copy of the GNU General Public License along
25 * with this program. If not, see <http://www.gnu.org/licenses/>.
26 */
27-import QtQuick 2.0
28-import Ubuntu.Components 0.1
29+import QtQuick 2.4
30+import Ubuntu.Components 1.3
31
32 Column {
33 id: loginFormColumn
34
35=== modified file 'online-accounts-provider/Main.qml'
36--- online-accounts-provider/Main.qml 2014-08-01 19:53:01 +0000
37+++ online-accounts-provider/Main.qml 2016-03-21 14:53:55 +0000
38@@ -15,8 +15,8 @@
39 * with this program. If not, see <http://www.gnu.org/licenses/>.
40 */
41
42-import QtQuick 2.0
43-import Ubuntu.Components 0.1
44+import QtQuick 2.4
45+import Ubuntu.Components 1.3
46 import Ubuntu.OnlineAccounts 0.1
47
48 Flickable {
49
50=== modified file 'online-accounts-provider/NewAccount.qml'
51--- online-accounts-provider/NewAccount.qml 2015-07-09 09:51:00 +0000
52+++ online-accounts-provider/NewAccount.qml 2016-03-21 14:53:55 +0000
53@@ -15,8 +15,8 @@
54 * with this program. If not, see <http://www.gnu.org/licenses/>.
55 */
56
57-import QtQuick 2.0
58-import Ubuntu.Components 0.1
59+import QtQuick 2.4
60+import Ubuntu.Components 1.3
61 import UbuntuOne 1.0
62 import Ubuntu.OnlineAccounts 0.1
63
64
65=== modified file 'online-accounts-provider/RegisterForm.qml'
66--- online-accounts-provider/RegisterForm.qml 2014-08-01 19:53:01 +0000
67+++ online-accounts-provider/RegisterForm.qml 2016-03-21 14:53:55 +0000
68@@ -14,8 +14,8 @@
69 * You should have received a copy of the GNU General Public License along
70 * with this program. If not, see <http://www.gnu.org/licenses/>.
71 */
72-import QtQuick 2.0
73-import Ubuntu.Components 0.1
74+import QtQuick 2.4
75+import Ubuntu.Components 1.3
76
77 Column {
78 id: registerFormColumn

Subscribers

People subscribed via source and target branches