address-book-app

Merge lp:~zsombi/address-book-app/bottomEdgeCollision into lp:address-book-app

  1. bottomEdgeCollision
  2. Merge into trunk
Proposed by Zsombor Egri
Status: Merged
Approved by: Zoltan Balogh
Approved revision: 515
Merged at revision: 518
Proposed branch: lp:~zsombi/address-book-app/bottomEdgeCollision
Merge into: lp:address-book-app
Diff against target: 51 lines (+6/-4)
2 files modified
src/imports/ABContactListPage.qml (+3/-1)
tests/qml/tst_ContactEditor.qml (+3/-3)
To merge this branch: bzr merge lp:~zsombi/address-book-app/bottomEdgeCollision
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Needs Fixing
Zoltan Balogh (community) Approve
Review via email: mp+279727@code.launchpad.net

Commit message

BottomEdge name collides with Ubuntu.Components 1.3 component name.

Description of the change

BottomEdge name collides with Ubuntu.Components 1.3 component name.

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

Does the job

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:515
http://jenkins.qa.ubuntu.com/job/address-book-app-ci/1051/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-app-vivid-i386-ci/354
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/5613
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-touch/4385
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/5627
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/5627/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/25831

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/address-book-app-ci/1051/rebuild

review: Needs Fixing (continuous-integration)
lp:~zsombi/address-book-app/bottomEdgeCollision updated
516. By Zsombor Egri

adjust ActionBar button query

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/imports/ABContactListPage.qml'
2--- src/imports/ABContactListPage.qml 2015-11-25 16:59:11 +0000
3+++ src/imports/ABContactListPage.qml 2015-12-08 07:47:27 +0000
4@@ -26,6 +26,8 @@
5 import Ubuntu.AddressBook.Base 0.1
6 import Ubuntu.AddressBook.ContactShare 0.1
7
8+import "." as AB
9+
10 Page {
11 id: mainPage
12 objectName: "contactListPage"
13@@ -671,7 +673,7 @@
14 }
15 }
16
17- BottomEdge {
18+ AB.BottomEdge {
19 id: bottomEdge
20 objectName: "bottomEdge"
21
22
23=== modified file 'tests/qml/tst_ContactEditor.qml'
24--- tests/qml/tst_ContactEditor.qml 2015-10-26 13:18:11 +0000
25+++ tests/qml/tst_ContactEditor.qml 2015-12-08 07:47:27 +0000
26@@ -69,7 +69,7 @@
27
28 function init() {
29 waitForRendering(contactEditor);
30- var saveButton = findChild(root, 'save_action_button');
31+ var saveButton = findChild(root, 'save_button');
32 compare(saveButton.enabled, false);
33 }
34
35@@ -113,7 +113,7 @@
36 function test_fillRequiredFieldsMustEnableSaveButton(data) {
37 var textField = findChild(root, data.objectName);
38 textField.text = 'test'
39- var saveButton = findChild(root, 'save_action_button');
40+ var saveButton = findChild(root, 'save_button');
41 tryCompare(saveButton, 'enabled', true);
42 }
43
44@@ -125,7 +125,7 @@
45 function test_fillOptionalFieldsMustNotEnableSaveButton(data) {
46 var textField = findChild(root, data.objectName);
47 textField.text = 'test'
48- var saveButton = findChild(root, 'save_action_button');
49+ var saveButton = findChild(root, 'save_button');
50 tryCompare(saveButton, 'enabled', false);
51 }
52

Subscribers

People subscribed via source and target branches