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

[Victor Thompson]

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

[lp:~vthompson/ubuntu-filemanager-app/qml-folderlistmodel]

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)]

Thank you!

review: Approve

=== modified file 'qml-folderlistmodel.pro'
--- qml-folderlistmodel.pro	2013-03-03 09:21:52 +0000
+++ qml-folderlistmodel.pro	2013-03-18 04:58:20 +0000
@@ -31,7 +31,7 @@
 
 qmldir.files = qmldir
 unix {
-    installPath = $$[QT_INSTALL_IMPORTS]/$$replace(uri, \\., /)
+    installPath = $$[QT_INSTALL_QML]/$$replace(uri, \\., /)
     qmldir.path = $$installPath
     target.path = $$installPath
     INSTALLS += target qmldir