summaryrefslogtreecommitdiffstats
path: root/doc
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2011-01-132-4/+14
|\
| * Doc: correcting merge errorMorten Engvoldsen2011-01-121-4/+9
| * Adding a link to the coding style wiki page.Jerome Pasion2011-01-071-0/+5
* | Doc: Added a missing snippet.David Boddie2011-01-131-0/+51
|/
* Doc: Sync with upstream.David Boddie2010-12-221-1/+1
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2010-12-216-15/+9
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2010-12-212-29/+29
| |\
| * | Doc: Changed a page title.David Boddie2010-12-215-6/+6
| * | Doc: Updated the HarfBuzz license information.David Boddie2010-12-211-9/+3
* | | Doc: Fixed QML syntax in quoted code snippets.David Boddie2010-12-212-1/+62
| |/ |/|
* | Merge branch 'qdoc-simplified' into 4.7David Boddie2010-12-212-29/+29
|\ \ | |/ |/|
| * Doc: Fixed whitespace.David Boddie2010-12-212-29/+29
* | Merge branch '4.7-upstream' into 4.7-docA-Team2010-12-202-1/+5
|\ \
| * | Update docs on importing javascript filesBea Lam2010-12-202-1/+5
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2010-12-202-1/+40
|\ \ \ | |_|/ |/| |
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Jerome Pasion2010-12-201-1/+1
| |\ \
| | * \ Merge branch '4.7-upstream' into 4.7-docA-Team2010-12-171-1/+1
| | |\ \ | | | |/
| | | * Doc: typo fixed in doc/src/declarative/extending.qdocJoerg Bornemann2010-12-161-1/+1
| * | | Added BSD license to snippet code.Jerome Pasion2010-12-201-0/+39
| |/ /
* | | Updated the offline template to use a new offline style sheet.David Boddie2010-12-171-0/+662
* | | Doc: Fixed whitespace.David Boddie2010-12-171-61/+14
* | | Doc: Fixed broken links.David Boddie2010-12-173-12/+10
* | | Merge branch '4.7' into qdoc-simplifiedDavid Boddie2010-12-171-30/+51
|\ \ \ | |/ /
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2010-12-161-30/+51
| |\ \
| | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2010-12-1520-3133/+1276
| | |\ \
| | * | | Doc: Added a note about the Public Suffix List.David Boddie2010-12-101-30/+51
* | | | | Whitespace fixes.David Boddie2010-12-171-553/+533
|/ / / /
* | | | Merge branch '4.7' into qdoc-simplifiedDavid Boddie2010-12-1512-24/+389
|\ \ \ \ | | |/ / | |/| |
| * | | Merge branch '4.7-upstream' into 4.7-docA-Team2010-12-139-21/+385
| |\ \ \ | | | |/ | | |/|
| | * | Improvements to anchoring docsBea Lam2010-12-091-17/+49
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-12-098-4/+336
| | |\ \
| | | * | Document support for QVariantList and QVariantMap type conversionBea Lam2010-12-064-1/+156
| | | * | Some doc clarification for components and javascript integrationBea Lam2010-12-061-3/+2
| | | * | Qt.include() docs weren't being picked up by qdocBea Lam2010-12-064-0/+178
| * | | | doc: Replaced some \raw and \endraw uses with \table and \endtableMartin Smith2010-12-131-82/+30
| * | | | doc: Replaced some \raw and \endraw uses with \table and \endtableMartin Smith2010-12-138-2692/+768
| * | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Martin Smith2010-12-132-3/+3
| |\ \ \ \
| | * \ \ \ Merge branch '4.7-upstream' into 4.7-docA-Team2010-12-091-2/+2
| | |\ \ \ \ | | | |/ / / | | | | | / | | | |_|/ | | |/| |
| | | * | Merge branch '4.7-upstream' into 4.7-waterThierry Bastian2010-12-0328-316/+1287
| | | |\ \ | | | | |/
| | | * | Merge branch '4.7-upstream' into 4.7-waterThierry Bastian2010-12-021-0/+9
| | | |\ \
| | | * \ \ Merge branch '4.7-upstream' into 4.7-waterThierry Bastian2010-12-012-6/+6
| | | |\ \ \
| | | * \ \ \ Merge branch '4.7-upstream' into 4.7-waterThierry Bastian2010-11-305-2/+108
| | | |\ \ \ \
| | | * \ \ \ \ Merge branch '4.7-upstream' into 4.7-waterThierry Bastian2010-11-291-4/+9
| | | |\ \ \ \ \
| | | * | | | | | Fix documentation for QML extended typesCaio Marcelo de Oliveira Filho2010-11-291-2/+2
| | * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Geir Vattekar2010-12-0963-619/+2320
| | |\ \ \ \ \ \ \
| | * | | | | | | | Doc: Fixed doc bug in Diagram Scene exampleGeir Vattekar2010-12-091-1/+1
| * | | | | | | | | doc: Replaced some \raw and \endraw uses with \table and \endtableMartin Smith2010-12-131-336/+91
| | |/ / / / / / / | |/| | | | | | |
| * | | | | | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Martin Smith2010-12-0978-663/+3037
| |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Jerome Pasion2010-12-086-18/+65
| | |\ \ \ \ \ \ \ \
| | * | | | | | | | | Doc: Added link to QML Basic Types in main Qt Quick page.Jerome Pasion2010-12-081-0/+1