summaryrefslogtreecommitdiff
path: root/tools/qdoc3/test
Commit message (Expand)AuthorAgeFilesLines
...
| * Whitespace fixes.David Boddie2010-12-171-1/+1
| * Removed macros for figures and floats. We'll use \div...\enddiv instead.David Boddie2010-12-141-32/+0
| * Merge branch 'qdoc-simplified' into mimir-simplifiedDavid Boddie2010-12-145-53/+42
| |\
| | * Added macros for floating images and floating images with alt text.David Boddie2010-12-131-0/+32
| | * Removed redundant style information and images.David Boddie2010-12-094-53/+10
| * | qdoc: Changed index.qdoc to use new \div commandMartin Smith2010-12-142-0/+2
| * | doc: Removed the \hr macro from the DITA XML qdocconf file.Martin Smith2010-12-091-1/+1
| * | Updated the DITA configuration to use the new configuration structure.David Boddie2010-12-071-1/+1
| * | Merge branch 'qdoc-simplified' into mimir-simplifiedDavid Boddie2010-12-0730-2461/+1189
| |\ \ | | |/
| | * Merge branch '4.7' into qdoc-simplifiedDavid Boddie2010-11-307-20/+20
| | |\
| | * | Fixed grammar.David Boddie2010-11-292-2/+2
| | * | Added the version number to the configuration and fixed the generator.David Boddie2010-11-241-1/+4
| | * | Moved style-specific declarations. Removed script declarations.David Boddie2010-11-184-43/+70
| | * | Started fixing qdoc's output to use some kind of page templates.David Boddie2010-11-1117-1137/+1139
| | * | Removed obsolete files.David Boddie2010-11-106-1336/+0
| * | | qdoc: Fixed some reported bugs in the XML.Martin Smith2010-12-061-1/+7
| * | | Merge branch '4.7' into mimirMorten Engvoldsen2010-10-091-2/+3
| |\ \ \
| * \ \ \ Merge branch '4.7' into mimirMorten Engvoldsen2010-09-291-32/+8
| |\ \ \ \
| * \ \ \ \ Merge branch '4.7' into mimirMorten Engvoldsen2010-09-2312-38/+38
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'mimir' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into mimirMorten Engvoldsen2010-09-201-0/+31
| |\ \ \ \ \ \
| | * | | | | | qdoc: DITA XML generator now uses <section> elements...Martin Smith2010-09-181-0/+31
* | | | | | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-01-171-3/+3
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix for qtdemo bugJerome Pasion2011-01-101-3/+3
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | Merge remote branch 'qt/master'Jason McDonald2010-11-221-1/+1
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-11-192-2/+11
| |\ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into master-s60axis2010-11-196-15/+23
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | / / / / / / / | | |/ / / / / / / | |/| | | | | | |
| * | | | | | | | Merge remote branch 'qt/4.7' into 4.7Jason McDonald2010-11-182-3/+11
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | qdoc: Added QML Elements to the Assistant indexMartin Smith2010-11-112-3/+11
| | | |_|_|_|_|/ | | |/| | | | |
| * | | | | | | Bump Qt version to 4.7.2.Jason McDonald2010-11-1211-36/+36
| |/ / / / / /
* | | | | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-11-051-1/+1
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Doc: Correcting character escape bugMorten Engvoldsen2010-11-041-1/+1
* | | | | | | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-11-041-1/+33
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Doc: updating the template to support search feature better.Morten Engvoldsen2010-11-031-1/+33
| | |_|_|_|/ | |/| | | |
* | | | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-10-251-2/+3
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Added Q_INVOKABLE to ignore file.Jerome Pasion2010-10-081-2/+3
| | |_|_|/ | |/| | |
* | | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-10-071-32/+8
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch '4.7' into newSearchMorten Engvoldsen2010-09-281-31/+0
| |\ \ \ \
| | * | | | Doc: fixing bugs in slim-fit styleMorten Engvoldsen2010-09-281-31/+0
| | | |_|/ | | |/| |
| * | | | Doc: Implementing new search displayMorten Engvoldsen2010-09-241-1/+8
| |/ / /
* | | | Merge remote branch 'origin/4.7' into master-from-4.7Rohan McGovern2010-10-041-2/+2
|\ \ \ \ | |/ / /
| * | | Doc: maintainance - fixing grammar and spellingMorten Engvoldsen2010-09-231-2/+2
| * | | Bump version to 4.7.1.Jason McDonald2010-09-2111-36/+36
| |/ /
* | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Thiago Macieira2010-09-217-36/+51
|\ \ \ | |/ /
| * | Doc: removing linebreakMorten Engvoldsen2010-09-161-1/+0
| * | Doc: correcting html templateMorten Engvoldsen2010-09-161-12/+3
| * | Revert "Doc: fixing page name bug caused by 07bbace404078dcfd82eff717daa97299...Morten Engvoldsen2010-09-151-28/+22
| * | git Merge branch '4.7-upstream' into 4.7-docJesper Thomschutz2010-09-151-1/+1
| |\ \ | | |/ | |/|
| | * Revert "Doc: fixing page name bug caused by 07bbace404078dcfd82eff717daa97299...Morten Engvoldsen2010-09-101-1/+1
| * | Doc: Excluded the libconninet library from the documentation.David Boddie2010-09-084-6/+10
| * | Merge branch '4.7-oslo1' into 4.7-docA-Team2010-09-0712-100/+117
| |\ \ | | |/