Merge lp://qastaging/~kevin-wright-1/u1db-qt/documentation-april-8-2013-i into lp://qastaging/u1db-qt
| Status: | Merged |
|---|---|
| Approved by: | Cris Dywan |
| Approved revision: | 69 |
| Merged at revision: | 64 |
| Proposed branch: | lp://qastaging/~kevin-wright-1/u1db-qt/documentation-april-8-2013-i |
| Merge into: | lp://qastaging/u1db-qt |
| Diff against target: |
5542 lines (+3279/-2111) 26 files modified
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 (+30/-3) 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.qdoc (+203/-0) examples/u1db-qt-example-5/u1db-qt-example-5.qml (+122/-0) |
| To merge this branch: | bzr merge lp://qastaging/~kevin-wright-1/u1db-qt/documentation-april-8-2013-i |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Cris Dywan | Approve | ||
| Ubuntu Phone Apps Jenkins Bot | continuous-integration | Approve | |
|
Review via email:
|
|||
Commit message
Moved qdoc markup from qml example files into .qdoc files. Provided a sub-directory under 'examples' for each existing example that includes both the example qml and corresponding qdoc file. Modified u1db.qdocconf to account for these changes. Additionally modified u1db.qdocconf to automatically add the correct styles to each html output file (required some additional modifications to postheader, footer etc. to support the style sheets)
Description of the change
Moved qdoc markup from qml example files into .qdoc files. Provided a sub-directory under 'examples' for each existing example that includes both the example qml and corresponding qdoc file. Modified u1db.qdocconf to account for these changes. Additionally modified u1db.qdocconf to automatically add the correct styles to each html output file (required some additional modifications to postheader, footer etc. to support the style sheets).
| Kevin Wright (kevin-wright-1) wrote | # |
| Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote | # |
| Cris Dywan (kalikiana) | # |
Only some of the qdoc markup has been migrated to separate qdoc files from the qml examples. This will be corrected in a commit to follow.
Also, some known issues:
* qdoc creates additional html output files for some examples that are not necessary
* qdoc adds the title twice at the start of the file -- one in <li> tags and the other <h1>
* Can't seem to reference the example's qml code