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

[Zsombor Egri]

BottomEdge name collides with Ubuntu.Components 1.3 component name.

BottomEdge name collides with Ubuntu.Components 1.3 component name.

[Zoltan Balogh (bzoltan)]

Does the job

review: Approve

[PS Jenkins bot (ps-jenkins)]

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]

516. By Zsombor Egri on 2015-12-08

adjust ActionBar button query

=== modified file 'src/imports/ABContactListPage.qml'
--- src/imports/ABContactListPage.qml	2015-11-25 16:59:11 +0000
+++ src/imports/ABContactListPage.qml	2015-12-08 07:47:27 +0000
@@ -26,6 +26,8 @@
 import Ubuntu.AddressBook.Base 0.1
 import Ubuntu.AddressBook.ContactShare 0.1
 
+import "." as AB
+
 Page {
     id: mainPage
     objectName: "contactListPage"
@@ -671,7 +673,7 @@
         }
     }
 
-    BottomEdge {
+    AB.BottomEdge {
         id: bottomEdge
         objectName: "bottomEdge"
 
 
=== modified file 'tests/qml/tst_ContactEditor.qml'
--- tests/qml/tst_ContactEditor.qml	2015-10-26 13:18:11 +0000
+++ tests/qml/tst_ContactEditor.qml	2015-12-08 07:47:27 +0000
@@ -69,7 +69,7 @@
 
         function init() {
             waitForRendering(contactEditor);
-            var saveButton = findChild(root, 'save_action_button');
+            var saveButton = findChild(root, 'save_button');
             compare(saveButton.enabled, false);
         }
 
@@ -113,7 +113,7 @@
         function test_fillRequiredFieldsMustEnableSaveButton(data) {
             var textField = findChild(root, data.objectName);
             textField.text = 'test'
-            var saveButton = findChild(root, 'save_action_button');
+            var saveButton = findChild(root, 'save_button');
             tryCompare(saveButton, 'enabled', true);
         }
 
@@ -125,7 +125,7 @@
         function test_fillOptionalFieldsMustNotEnableSaveButton(data) {
             var textField = findChild(root, data.objectName);
             textField.text = 'test'
-            var saveButton = findChild(root, 'save_action_button');
+            var saveButton = findChild(root, 'save_button');
             tryCompare(saveButton, 'enabled', false);
         }