Merge lp://qastaging/~vthompson/ubuntu-filemanager-app/qml-folderlistmodel into lp://qastaging/ubuntu-filemanager-app
Status: | Superseded |
---|---|
Proposed branch: | lp://qastaging/~vthompson/ubuntu-filemanager-app/qml-folderlistmodel |
Merge into: | lp://qastaging/ubuntu-filemanager-app |
Diff against target: |
1171 lines (+1106/-0) (has conflicts) 13 files modified
README (+6/-0) dirmodel.cpp (+431/-0) dirmodel.h (+136/-0) iorequest.cpp (+36/-0) iorequest.h (+51/-0) iorequestworker.cpp (+92/-0) iorequestworker.h (+61/-0) ioworkerthread.cpp (+64/-0) ioworkerthread.h (+52/-0) plugin.cpp (+53/-0) plugin.h (+82/-0) qml-folderlistmodel.pro (+39/-0) qmldir (+3/-0) Conflict adding file README. Moved existing file to README.moved. |
To merge this branch: | bzr merge lp://qastaging/~vthompson/ubuntu-filemanager-app/qml-folderlistmodel |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Arto Jalkanen | Pending | ||
Review via email:
|
This proposal has been superseded by 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).
Unmerged revisions
- 11. By Victor Thompson
-
Add TagLib to the building of the plugin and use TagLib to read metadata
- 10. By Victor Thompson
-
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.
- 9. By Victor Thompson
-
fix install path to correctly use qmldir.
- 8. By Arto Jalkanen
-
Added homePath function. ParentPath property is refreshed when path changes.
- 7. By Arto Jalkanen
-
Added parentPath property.
- 6. By Arto Jalkanen
-
Some small cleanup between separation of Qt4 and Qt5 code.
- 5. By Arto Jalkanen
-
Made the code a bit cleaner, separating qt4/qt5 code into one block.
- 4. By Arto Jalkanen
-
Restored metatype registration that was removed during testing.
- 3. By Arto Jalkanen
-
Added basic README
- 2. By Arto Jalkanen
-
Corrections by Carlos J Mazieri to build files to make the library importable.