Ubuntu File Manager App

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

  1. parentPathAsPropertyAgain
  2. Merge into trunk
Proposed by Arto Jalkanen
Status: Merged
Approved by: Arto Jalkanen
Approved revision: 19
Merged at revision: 19
Proposed branch: lp:~ajalkane/ubuntu-filemanager-app/parentPathAsPropertyAgain
Merge into: lp:ubuntu-filemanager-app
Diff against target: 25 lines (+2/-2)
2 files modified
FolderListPage.qml (+1/-1)
README (+1/-1)
To merge this branch: bzr merge lp:~ajalkane/ubuntu-filemanager-app/parentPathAsPropertyAgain
Reviewer Review Type Date Requested Status
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve
Arto Jalkanen Approve
Review via email: mp+159008@code.launchpad.net

Commit message

parentPath as property (from upstream)

Description of the change

parentPath as property (from upstream)

To post a comment you must log in.
Revision history for this message
Arto Jalkanen (ajalkane) wrote :

Ok for me.

review: Approve
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'FolderListPage.qml'
2--- FolderListPage.qml 2013-04-01 17:25:23 +0000
3+++ FolderListPage.qml 2013-04-15 19:53:26 +0000
4@@ -36,7 +36,7 @@
5 back: Action {
6 text: i18n.tr("Up")
7 onTriggered: {
8- pageModel.path = pageModel.parentPath()
9+ pageModel.path = pageModel.parentPath
10 console.log("Up triggered")
11 }
12 visible: pageModel.path != "/"
13
14=== modified file 'README'
15--- README 2013-03-18 21:30:47 +0000
16+++ README 2013-04-15 19:53:26 +0000
17@@ -5,7 +5,7 @@
18
19 Currently it can be obtained like this:
20
21-bzr branch lp:~ajalkane/ubuntu-filemanager-app/qml-folderlistmodel
22+bzr branch lp:~carlos-mazieri/ubuntu-filemanager-app/model
23
24 Running filemanager
25 ===================

Subscribers

People subscribed via source and target branches