Merge lp:~boiko/address-book-app/fix_settings_button into lp:address-book-app

[Gustavo Pichorim Boiko]

Fix loading the settings page

Fix loading the settings page

== Checklist ==
Are there any related MPs required for this MP to build/function as expected? Please list.
No

Is your branch in sync with latest trunk (e.g. bzr pull lp:trunk -> no changes)
Yes

Did you perform an exploratory manual test run of your code change and any related functionality on device or emulator?
Yes

Did you successfully run all tests found in your component's Test Plan (https://wiki.ubuntu.com/Process/Merges/TestPlan/<package-name>) on device or emulator?
Yes

If you changed the UI, was the change specified/approved by design?
N/A

If you changed UI labels, did you update the pot file?
N/A

If you changed the packaging (debian), did you add a core-dev as a reviewer to this MP?
N/A

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:458
http://jenkins.qa.ubuntu.com/job/address-book-app-ci/830/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-app-vivid-i386-ci/133
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/2998
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/2556
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2996
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2996/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/20815

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

review: Approve (continuous-integration)

[Renato Araujo Oliveira Filho (renatofilho)]

Did you perform an exploratory manual test run of the code change and any related functionality on device or emulator?
Yes

Did CI run pass? If not, please explain why.
Yes

Have you checked that submitter has accurately filled out the submitter checklist and has taken no shortcut?
Yes

review: Approve

=== modified file 'src/imports/ABContactListPage.qml'
--- src/imports/ABContactListPage.qml	2015-05-27 22:51:29 +0000
+++ src/imports/ABContactListPage.qml	2015-05-27 22:51:29 +0000
@@ -234,7 +234,7 @@
                 Action {
                     text: i18n.tr("Settings")
                     iconName: "settings"
-                    onTriggered: pageStack.push(Qt.resolvedUrl("../Settings/SettingsPage.qml"),
+                    onTriggered: pageStack.push(Qt.resolvedUrl("./Settings/SettingsPage.qml"),
                                                 {"contactListModel": contactList.listModel})
                 }
             ]

=== modified file 'src/imports/Ubuntu/Contacts/simcardcontacts.cpp'
--- src/imports/Ubuntu/Contacts/simcardcontacts.cpp	2015-03-17 15:00:40 +0000
+++ src/imports/Ubuntu/Contacts/simcardcontacts.cpp	2015-05-27 22:51:29 +0000
@@ -229,8 +229,6 @@
 
 void SimCardContacts::importDone()
 {
-    Q_ASSERT(m_pendingModems.isEmpty());
-
     writeData();
     m_importing.unlock();
     Q_EMIT contactsChanged();