U1DB Qt/ QML

Merge lp://qastaging/~kalikiana/u1db-qt/queryLog into lp://qastaging/u1db-qt

  1. queryLog
  2. Merge into trunk
Proposed by Cris Dywan
Status: Merged
Approved by: Cris Dywan
Approved revision: 116
Merged at revision: 112
Proposed branch: lp://qastaging/~kalikiana/u1db-qt/queryLog
Merge into: lp://qastaging/u1db-qt
Diff against target: 849 lines (+195/-488)
7 files modified
examples/CMakeLists.txt (+1/-1)
examples/bookmarks/bookmarks.qml (+131/-450)
examples/u1db-qt-example-4/u1db-qt-example-4.qdoc (+0/-24)
src/index.cpp (+6/-2)
src/query.cpp (+16/-8)
src/query.h (+2/-2)
tests/tst_query.qml (+39/-1)
To merge this branch: bzr merge lp://qastaging/~kalikiana/u1db-qt/queryLog
Reviewer Review Type Date Requested Status
Benjamin Zeller Approve
PS Jenkins bot continuous-integration Approve
Review via email: mp+204327@code.qastaging.launchpad.net

Commit message

Query improvements and more advanced example

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:111
http://jenkins.qa.ubuntu.com/job/u1db-qt-ci/33/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/u1db-qt-precise-amd64-ci/33
    SUCCESS: http://jenkins.qa.ubuntu.com/job/u1db-qt-saucy-amd64-ci/35
    SUCCESS: http://jenkins.qa.ubuntu.com/job/u1db-qt-trusty-amd64-ci/13
    SUCCESS: http://jenkins.qa.ubuntu.com/job/u1db-qt-trusty-armhf-ci/13

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/u1db-qt-ci/33/rebuild

review: Approve (continuous-integration)
lp://qastaging/~kalikiana/u1db-qt/queryLog updated
112. By Cris Dywan

Override built-in compare to resolve matching and JSON output

113. By Cris Dywan

Add unit tests for top level fields and list in hash

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:113
http://jenkins.qa.ubuntu.com/job/u1db-qt-ci/34/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/u1db-qt-precise-amd64-ci/34
    SUCCESS: http://jenkins.qa.ubuntu.com/job/u1db-qt-saucy-amd64-ci/36
    SUCCESS: http://jenkins.qa.ubuntu.com/job/u1db-qt-trusty-amd64-ci/14
    SUCCESS: http://jenkins.qa.ubuntu.com/job/u1db-qt-trusty-armhf-ci/14

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/u1db-qt-ci/34/rebuild

review: Approve (continuous-integration)
lp://qastaging/~kalikiana/u1db-qt/queryLog updated
114. By Cris Dywan

Fix glob for installing all examples

115. By Cris Dywan

Merge lp:u1db-qt

116. By Cris Dywan

Use deleteDoc to delete document from the bookmarks example

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:116
http://jenkins.qa.ubuntu.com/job/u1db-qt-ci/37/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/u1db-qt-precise-amd64-ci/37
    SUCCESS: http://jenkins.qa.ubuntu.com/job/u1db-qt-saucy-amd64-ci/39
    SUCCESS: http://jenkins.qa.ubuntu.com/job/u1db-qt-trusty-amd64-ci/17
    SUCCESS: http://jenkins.qa.ubuntu.com/job/u1db-qt-trusty-armhf-ci/17

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/u1db-qt-ci/37/rebuild

review: Approve (continuous-integration)
Revision history for this message
Benjamin Zeller (zeller-benjamin) wrote :

Looks good, ok to merge

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: