Merge lp:~vthompson/ubuntu-filemanager-app/qml-folderlistmodel into lp:~ajalkane/ubuntu-filemanager-app/qml-folderlistmodel

Proposed by Victor Thompson on 2013-03-18
Status: Merged
Approved by: Arto Jalkanen on 2013-03-18
Approved revision: 9
Merged at revision: 9
Proposed branch: lp:~vthompson/ubuntu-filemanager-app/qml-folderlistmodel
Merge into: lp:~ajalkane/ubuntu-filemanager-app/qml-folderlistmodel
Diff against target: 12 lines (+1/-1)
1 file modified
qml-folderlistmodel.pro (+1/-1)
To merge this branch: bzr merge lp:~vthompson/ubuntu-filemanager-app/qml-folderlistmodel
Reviewer Review Type Date Requested Status
Arto Jalkanen 2013-03-18 Approve on 2013-03-18
Review via email: mp+153701@code.launchpad.net

This proposal supersedes a proposal from 2013-03-18.

Description of the change

This fixes Bug #1154369 by using the QT_INSTALL_QML (qmldir) directory for installation rather than the QT_INSTALL_IMPORTS (importsdir).

To post a comment you must log in.
10. By Victor Thompson on 2013-03-18

Fix name filtering so if the filter has more than entry any one of the entries will match the filename. Also, added a filterDirectories bool, which defaults to false, so a user can choose to filter directories. Qt labs version did not filter directories, while this version did. Typical use case is to filter filename extensions which do not apply to directories.

Arto Jalkanen (ajalkane) wrote :

Thank you!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'qml-folderlistmodel.pro'
2--- qml-folderlistmodel.pro 2013-03-03 09:21:52 +0000
3+++ qml-folderlistmodel.pro 2013-03-18 04:58:20 +0000
4@@ -31,7 +31,7 @@
5
6 qmldir.files = qmldir
7 unix {
8- installPath = $$[QT_INSTALL_IMPORTS]/$$replace(uri, \\., /)
9+ installPath = $$[QT_INSTALL_QML]/$$replace(uri, \\., /)
10 qmldir.path = $$installPath
11 target.path = $$installPath
12 INSTALLS += target qmldir

Subscribers

People subscribed via source and target branches

to all changes: