Merge lp:~jamesh/mediascanner/qml-plugin into lp:mediascanner/v2
Status: | Superseded |
---|---|
Proposed branch: | lp:~jamesh/mediascanner/qml-plugin |
Merge into: | lp:mediascanner/v2 |
Diff against target: |
384 lines (+287/-1) 13 files modified
CMakeLists.txt (+2/-0) debian/control (+16/-0) debian/copyright (+1/-1) debian/qtdeclarative5-ubuntu-mediascanner0.1.install (+1/-0) src/qml/Ubuntu/MediaScanner/CMakeLists.txt (+52/-0) src/qml/Ubuntu/MediaScanner/MediaFileWrapper.cc (+49/-0) src/qml/Ubuntu/MediaScanner/MediaFileWrapper.hh (+39/-0) src/qml/Ubuntu/MediaScanner/MediaStoreWrapper.cc (+22/-0) src/qml/Ubuntu/MediaScanner/MediaStoreWrapper.hh (+30/-0) src/qml/Ubuntu/MediaScanner/plugin.cc (+9/-0) src/qml/Ubuntu/MediaScanner/plugin.hh (+15/-0) src/qml/Ubuntu/MediaScanner/plugin.qmltypes (+49/-0) src/qml/Ubuntu/MediaScanner/qmldir (+2/-0) |
To merge this branch: | bzr merge lp:~jamesh/mediascanner/qml-plugin |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
PS Jenkins bot (community) | continuous-integration | Approve | |
Timo Jyrinki (community) | Approve | ||
Michal Hruby (community) | Needs Fixing | ||
Review via email: mp+199078@code.launchpad.net |
This proposal has been superseded by a proposal from 2014-01-15.
Commit message
First stages of a QML plugin for the Media Scanner. At present it only exposes the query() and lookup() interfaces.
Description of the change
QML binding for mediascanner library. Not yet complete, but enough to perform a simple query from QML.
Currently work in progress, but I wanted Jenkins to see it.
Unmerged revisions
- 205. By James Henstridge
-
Include the generated plugin.qmltypes file under source control, and add
a "make update-qmltypes" command to update it. - 204. By James Henstridge
-
Build-depend on QtQuick, since qmlplugindump seems to need it.
- 203. By James Henstridge
-
Rearrange source tree to match QML import paths so we can generate the
plugins.qmltypes file. - 202. By James Henstridge
-
Merge from trunk.
- 201. By James Henstridge
-
Add remaining MediaFile properties to QML wrapper.
- 200. By James Henstridge
-
Explicitly set ownership of MediaFileWrapper objects.
- 199. By James Henstridge
-
Version the QML plugin package and installation dir.
- 198. By James Henstridge
-
Correctly namespace the QML file.
- 197. By James Henstridge
-
Depend on qtdeclarative5-dev too.
- 196. By James Henstridge
-
Update packaging to cover QML plugin, and set plugin version to 0.1.
FAILED: Continuous integration, rev:195 /code.launchpad .net/~jamesh/ mediascanner/ qml-plugin/ +merge/ 199078/ +edit-commit- message
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:/
http:// jenkins. qa.ubuntu. com/job/ mediascanner- v2-ci/13/ jenkins. qa.ubuntu. com/job/ mediascanner- v2-trusty- amd64-ci/ 13/console jenkins. qa.ubuntu. com/job/ mediascanner- v2-trusty- armhf-ci/ 13/console jenkins. qa.ubuntu. com/job/ mediascanner- v2-trusty- i386-ci/ 13/console
Executed test runs:
FAILURE: http://
FAILURE: http://
FAILURE: http://
Click here to trigger a rebuild: s-jenkins. ubuntu- ci:8080/ job/mediascanne r-v2-ci/ 13/rebuild
http://