U1DB Qt/ QML

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

  1. qmlDocs
  2. Merge into trunk
Proposed by Cris Dywan
Status: Merged
Approved by: Cris Dywan
Approved revision: 118
Merged at revision: 124
Proposed branch: lp://qastaging/~kalikiana/u1db-qt/qmlDocs
Merge into: lp://qastaging/u1db-qt
Diff against target: 1204 lines (+367/-149)
11 files modified
documentation/u1db.qdocconf (+1/-6)
src/database.cpp (+66/-15)
src/database.h (+10/-0)
src/document.cpp (+68/-21)
src/document.h (+20/-1)
src/index.cpp (+49/-18)
src/index.h (+12/-1)
src/query.cpp (+54/-14)
src/query.h (+16/-0)
src/synchronizer.cpp (+66/-70)
src/synchronizer.h (+5/-3)
To merge this branch: bzr merge lp://qastaging/~kalikiana/u1db-qt/qmlDocs
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve
Marco Trevisan (Treviño) Approve
Review via email: mp+208818@code.qastaging.launchpad.net

Commit message

Port qdoc syntax to QML annotations

Description of the change

This gets us QML docs, including a few tweaks to ensure each has one example at the top, using highlighting and identifier linking. Behind each component a link is available to reveal the C++ version.

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

FAILED: Continuous integration, rev:113
http://jenkins.qa.ubuntu.com/job/u1db-qt-ci/40/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/u1db-qt-precise-amd64-ci/40/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/u1db-qt-saucy-amd64-ci/42/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/u1db-qt-trusty-amd64-ci/20/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/u1db-qt-trusty-armhf-ci/20/console

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

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:117
http://jenkins.qa.ubuntu.com/job/u1db-qt-ci/57/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/u1db-qt-vivid-amd64-ci/4
    SUCCESS: http://jenkins.qa.ubuntu.com/job/u1db-qt-vivid-armhf-ci/4

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

review: Approve (continuous-integration)
Revision history for this message
Marco Trevisan (Treviño) (3v1n0) wrote :

Looks good... Added two small comments, just to stay in sync with the recent approved changes...

review: Approve
lp://qastaging/~kalikiana/u1db-qt/qmlDocs updated
118. By Cris Dywan

Clarify path behavior documentation

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

PASSED: Continuous integration, rev:118
http://jenkins.qa.ubuntu.com/job/u1db-qt-ci/67/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/u1db-qt-vivid-amd64-ci/14
    SUCCESS: http://jenkins.qa.ubuntu.com/job/u1db-qt-vivid-armhf-ci/14

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

review: Approve (continuous-integration)

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: