Merge lp://qastaging/~kevin-wright-1/u1db-qt/documentation-examples-april-9-2013-i into lp://qastaging/u1db-qt
| Status: | Superseded |
|---|---|
| Proposed branch: | lp://qastaging/~kevin-wright-1/u1db-qt/documentation-examples-april-9-2013-i |
| Merge into: | lp://qastaging/u1db-qt |
| Diff against target: |
7623 lines (+4850/-2484) (has conflicts) 44 files modified
CMakeLists.txt (+10/-10) document.cpp (+0/-205) document.h (+0/-77) documentation/base.css (+0/-638) documentation/style/base.css (+638/-0) documentation/style/css.css (+12/-0) documentation/style/css_002.css (+6/-0) documentation/style/qtquick.css (+772/-0) documentation/style/reset.css (+8/-0) documentation/style/scratch.css (+61/-0) documentation/u1db.qdocconf (+35/-8) examples/u1db-qt-example-1.qml (+0/-98) examples/u1db-qt-example-1/u1db-qt-example-1.qdoc (+24/-0) examples/u1db-qt-example-1/u1db-qt-example-1.qml (+98/-0) examples/u1db-qt-example-2.qml (+0/-100) examples/u1db-qt-example-2/u1db-qt-example-2.qdoc (+24/-0) examples/u1db-qt-example-2/u1db-qt-example-2.qml (+99/-0) examples/u1db-qt-example-2b.qml (+0/-110) examples/u1db-qt-example-2b/u1db-qt-example-2b.qdoc (+24/-0) examples/u1db-qt-example-2b/u1db-qt-example-2b.qml (+111/-0) examples/u1db-qt-example-3.qml (+0/-479) examples/u1db-qt-example-3/u1db-qt-example-3.qdoc (+24/-0) examples/u1db-qt-example-3/u1db-qt-example-3.qml (+481/-0) examples/u1db-qt-example-4.qml (+0/-516) examples/u1db-qt-example-4/u1db-qt-example-4.qdoc (+24/-0) examples/u1db-qt-example-4/u1db-qt-example-4.qml (+518/-0) examples/u1db-qt-example-5.qml (+0/-167) examples/u1db-qt-example-5/u1db-qt-example-5-qml.qdoc (+129/-0) examples/u1db-qt-example-5/u1db-qt-example-5.qdoc (+200/-0) examples/u1db-qt-example-5/u1db-qt-example-5.qml (+122/-0) global.h (+0/-52) modules/U1db/plugin.cpp (+4/-4) private.h (+0/-19) src/database.cpp (+523/-0) src/database.h (+76/-0) src/document.cpp (+205/-0) src/document.h (+77/-0) src/global.h (+52/-0) src/index.cpp (+149/-0) src/index.h (+69/-0) src/private.h (+19/-0) src/query.cpp (+184/-0) src/query.h (+71/-0) tests/test-database.cpp (+1/-1) Contents conflict in database.cpp Contents conflict in database.h Contents conflict in index.cpp Contents conflict in index.h Contents conflict in query.cpp Contents conflict in query.h |
| To merge this branch: | bzr merge lp://qastaging/~kevin-wright-1/u1db-qt/documentation-examples-april-9-2013-i |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Ubuntu Phone Apps Jenkins Bot | continuous-integration | Needs Fixing | |
| Cris Dywan | Pending | ||
|
Review via email:
|
|||
This proposal has been superseded by a proposal from 2013-04-09.
Commit message
Modified directory structure and build configuration to improve doc generation. Source and header files were moved into their own sub-directory (src), and appropriate modifications made to account for this (e.g. Cmake instructions etc.). Also made changes to some example / qdoc files to work around current limitations in the doc build (e.g. cross linking / referencing other files, such as source for examples, not working properly).
Description of the change
Modified directory structure and build configuration to improve doc generation. Source and header files were moved into their own sub-directory (src), and appropriate modifications made to account for this (e.g. Cmake instructions etc.). Also made changes to some example / qdoc files to work around current limitations in the doc build (e.g. cross linking / referencing other files, such as source for examples, not working properly).
| Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote | # |
Unmerged revisions
- 71. By Kevin Wright
-
Added a qdoc file representing the qml code of example 5 (to work around current limitations in the doc configuration that doesn't build html files for example source.
- 70. By Kevin Wright
-
Modified directory structure and build configuration to improve doc generation. Source and header files were moved into their own sub-directory (src), and appropriate modifications made to account for this (e.g. Cmake instructions etc.). Also made changes to some example / qdoc files to work around current limitations in the doc build (e.g. cross linking / referencing other files, such as source for examples, not working properly).
FAILED: Continuous integration, rev:71
http://
Executed test runs:
FAILURE: http://
FAILURE: http://
Click here to trigger a rebuild:
http://