address-book-app

Merge lp:~akiva/address-book-app/upgrade-test-library-import-1.0 into lp:address-book-app

  1. upgrade-test-library-import-1.0
  2. Merge into trunk
Proposed by Akiva on 2014-09-02
Status: Needs review
Proposed branch: lp:~akiva/address-book-app/upgrade-test-library-import-1.0
Merge into: lp:address-book-app
Diff against target: 64 lines (+5/-5)
5 files modified
tests/qml/tst_ContactAvatar.qml (+1/-1)
tests/qml/tst_ContactEditor.qml (+1/-1)
tests/qml/tst_ContactPreviewPage.qml (+1/-1)
tests/qml/tst_ListWithActions.qml (+1/-1)
tests/qml/tst_VCardParser.qml (+1/-1)
To merge this branch: bzr merge lp:~akiva/address-book-app/upgrade-test-library-import-1.0
Reviewer Review Type Date Requested Status
Leo Arias (community) Needs Information on 2015-02-20
Ubuntu Phablet Team 2014-09-02 Pending
Review via email: mp+232968@code.launchpad.net
To post a comment you must log in.
lp:~akiva/address-book-app/upgrade-test-library-import-1.0 updated on 2014-09-08
296. By Akiva on 2014-09-08

Merge from trunk

Leo Arias (elopio) wrote :

Not sure why the update is needed. If we are not using any features added in the version 1.0, should we update?

review: Needs Information
Reply

Unmerged revisions

296. By Akiva on 2014-09-08

Merge from trunk

295. By Akiva on 2014-09-02

import Ubuntu.Test 0.1
to
import Ubuntu.Test 1.0

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'tests/qml/tst_ContactAvatar.qml'
2--- tests/qml/tst_ContactAvatar.qml 2014-07-08 14:20:01 +0000
3+++ tests/qml/tst_ContactAvatar.qml 2014-09-08 10:22:39 +0000
4@@ -17,7 +17,7 @@
5 import QtQuick 2.2
6 import QtContacts 5.0
7 import QtTest 1.0
8-import Ubuntu.Test 0.1
9+import Ubuntu.Test 1.0
10 import Ubuntu.Contacts 0.1
11
12 import "ContactUtil.js" as ContactUtilJS
13
14=== modified file 'tests/qml/tst_ContactEditor.qml'
15--- tests/qml/tst_ContactEditor.qml 2014-07-20 20:23:20 +0000
16+++ tests/qml/tst_ContactEditor.qml 2014-09-08 10:22:39 +0000
17@@ -17,7 +17,7 @@
18 import QtQuick 2.2
19 import QtTest 1.0
20 import Ubuntu.Components 1.1
21-import Ubuntu.Test 0.1
22+import Ubuntu.Test 1.0
23 import Ubuntu.Contacts 0.1
24
25 import "ContactUtil.js" as ContactUtilJS
26
27=== modified file 'tests/qml/tst_ContactPreviewPage.qml'
28--- tests/qml/tst_ContactPreviewPage.qml 2014-08-13 20:52:57 +0000
29+++ tests/qml/tst_ContactPreviewPage.qml 2014-09-08 10:22:39 +0000
30@@ -16,7 +16,7 @@
31
32 import QtQuick 2.2
33 import QtTest 1.0
34-import Ubuntu.Test 0.1
35+import Ubuntu.Test 1.0
36 import QtContacts 5.0
37 import Ubuntu.Components 1.1
38 import Ubuntu.Contacts 0.1
39
40=== modified file 'tests/qml/tst_ListWithActions.qml'
41--- tests/qml/tst_ListWithActions.qml 2014-08-25 21:29:23 +0000
42+++ tests/qml/tst_ListWithActions.qml 2014-09-08 10:22:39 +0000
43@@ -17,7 +17,7 @@
44 import QtQuick 2.2
45 import Ubuntu.Components 1.1
46 import QtTest 1.0
47-import Ubuntu.Test 0.1
48+import Ubuntu.Test 1.0
49 import Ubuntu.Contacts 0.1
50
51 Item {
52
53=== modified file 'tests/qml/tst_VCardParser.qml'
54--- tests/qml/tst_VCardParser.qml 2014-08-13 20:52:57 +0000
55+++ tests/qml/tst_VCardParser.qml 2014-09-08 10:22:39 +0000
56@@ -16,7 +16,7 @@
57
58 import QtQuick 2.2
59 import QtTest 1.0
60-import Ubuntu.Test 0.1
61+import Ubuntu.Test 1.0
62 import QtContacts 5.0
63
64 Item {

Subscribers

People subscribed via source and target branches

to all changes: