Merge lp:~renatofilho/address-book-app/fix-1549362 into lp:address-book-app

[Renato Araujo Oliveira Filho]

Make sure that the contact view back button still visible for apps that are not using AdaptivePageLayout.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:543
http://jenkins.qa.ubuntu.com/job/address-book-app-ci/1120/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-app-vivid-i386-ci/423
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/6626
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-touch/5029
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6637
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6637/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/27873

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

review: Needs Fixing (continuous-integration)

[Gustavo Pichorim Boiko (boiko)]

Looks good!

review: Approve

=== modified file 'src/imports/Ubuntu/AddressBook/ContactView/ContactViewPage.qml'
--- src/imports/Ubuntu/AddressBook/ContactView/ContactViewPage.qml	2016-02-13 02:35:02 +0000
+++ src/imports/Ubuntu/AddressBook/ContactView/ContactViewPage.qml	2016-02-24 23:07:55 +0000
@@ -58,7 +58,7 @@
                 iconName: "back"
                 name: "cancel"
                 enabled: visible && root.active && root.enabled
-                visible: (pageStack.columns === 1)
+                visible: (pageStack.columns == 1) || (pageStack.columns == undefined)
                 onTriggered: {
                    if (pageStack.removePages)
                         pageStack.removePages(root)