qml-friends

Merge lp://staging/~ken-vandine/qml-friends/friendsmodel into lp://staging/~super-friends/qml-friends/raring

  1. friendsmodel
  2. Merge into raring
Proposed by Ken VanDine
Status: Merged
Approved by: Robert Bruce Park
Approved revision: 52
Merged at revision: 52
Proposed branch: lp://staging/~ken-vandine/qml-friends/friendsmodel
Merge into: lp://staging/~super-friends/qml-friends/raring
Diff against target: 631 lines (+230/-149)
10 files modified
debian/changelog (+10/-0)
debian/control (+1/-0)
examples/streamview.qml (+0/-121)
modules/Friends/plugin/friendsutils.cpp (+0/-2)
modules/Friends/plugin/friendsutils.h (+1/-6)
modules/Friends/plugin/plugin.cpp (+9/-11)
modules/Friends/plugin/plugin.h (+2/-3)
modules/Friends/plugin/plugin.pro (+8/-6)
modules/Friends/plugin/streammodel.cpp (+153/-0)
modules/Friends/plugin/streammodel.h (+46/-0)
To merge this branch: bzr merge lp://staging/~ken-vandine/qml-friends/friendsmodel
Reviewer Review Type Date Requested Status
Robert Bruce Park Approve
Review via email: mp+152995@code.staging.launchpad.net

Description of the change

  * Added StreamModel
    - Filters available for stream and service
  * Updated for the schema changes in friends
  * debian/control
    - build depend on libdee-qt5-dev

To post a comment you must log in.
Revision history for this message
Ken VanDine (ken-vandine) wrote :

NOTE: there are API stubs for filtering by accountId as well, but the filter isn't actually implemented yet.

Revision history for this message
Robert Bruce Park (robru) wrote :

So I built and installed lp:~super-friends/friends/raring, this branch, and lp:gwibber, and gwibber itself seemed to work pretty well (showed data, likes worked, threaded replies, all working well...), but when I tried to run the example, I got this error:

$ QT_SELECT=qt5 qmlscene examples/streamview.qml
file:///home/robru/Applications/qml-friends/friendsmodel/examples/streamview.qml:40 StreamModel is not a type

Dunno if that's a bug or if my environment just isn't set up right to run it properly. Let me know and then I can approve!

review: Needs Information
Revision history for this message
Ken VanDine (ken-vandine) wrote :

I bet that is because of the file conflict, I'll check that out.

lp://staging/~ken-vandine/qml-friends/friendsmodel updated
52. By Ken VanDine

fixed conflict

Revision history for this message
Robert Bruce Park (robru) wrote :

Alright, looks good now ;-)

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to all changes: