Merge lp:~ajalkane/ubuntu-filemanager-app/parentPathFunction into lp:ubuntu-filemanager-app

[Arto Jalkanen]

parentPath is function in qml plugin instead of needlessly being property. Change to QML.

parentPath is function in qml plugin instead of needlessly being property. Change to QML.

[Arto Jalkanen (ajalkane)]

review: Approve

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Autolanding.
No commit message was specified in the merge proposal. Hit 'Add commit message' on the merge proposal web page or follow the link below. You can approve the merge proposal yourself to rerun.
https://code.launchpad.net/~ajalkane/ubuntu-filemanager-app/parentPathFunction/+merge/155067/+edit-commit-message

review: Needs Fixing (continuous-integration)

[Arto Jalkanen (ajalkane)]

Here's your comment Jenkins, it's the same as in "Description of change" : parentPath is function in qml plugin instead of needlessly being property. Change to QML.

Btw. Jenkins, if you're going to fail my merge request without comment, why do you have the "Comment" field as "Optional" ? Nevermind, I shouldn't try to talk with bots.

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Continuous integration, rev:16
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~ajalkane/ubuntu-filemanager-app/parentPathFunction/+merge/155067/+edit-commit-message

http://91.189.93.125:8080/job/ubuntu-filemanager-app-ci/7/
Executed test runs:
    SUCCESS: http://91.189.93.125:8080/job/ubuntu-filemanager-app-quantal-amd64-ci/7/console
    SUCCESS: http://91.189.93.125:8080/job/ubuntu-filemanager-app-raring-amd64-ci/7/console

Click here to trigger a rebuild:
http://91.189.93.125:8080/job/ubuntu-filemanager-app-ci/7/rebuild

review: Needs Fixing (continuous-integration)

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

review: Approve (continuous-integration)

=== modified file 'FolderListPage.qml'
--- FolderListPage.qml	2013-03-19 20:21:44 +0000
+++ FolderListPage.qml	2013-03-22 21:07:22 +0000
@@ -18,7 +18,7 @@
         back: Action {
             text: i18n.tr("Up")
             onTriggered: {
-                pageModel.path = pageModel.parentPath
+                pageModel.path = pageModel.parentPath()
                 console.log("Up triggered")
             }
             visible: pageModel.path != "/"