summaryrefslogtreecommitdiffstats
path: root/tools/qdoc3/test
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-04-075-3/+267
|\
| * qdoc: Added default values to config file for DITAMartin Smith2011-03-251-0/+7
| * Merge branch 'clone_4.7' into 4.7Jerome Pasion2011-03-235-3/+260
| |\
| | * Edited QtWebKit Guide CSS chapter. Created example links.Jerome Pasion2011-03-174-3/+259
| | * Adding QtWebKit Guide (BETA).Jerome Pasion2011-03-151-0/+1
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7David Boddie2011-03-228-25/+25
| |\ \ | | |/ | |/|
* | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-03-311-38/+2
|\ \ \
| * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7David Boddie2011-03-228-25/+25
| |\ \ \ | | |/ / | |/| / | | |/
| | * Bump Qt version to 4.7.4Timo Turunen2011-03-218-24/+24
| * | Doc: Removed help project declarations in the online configuration.David Boddie2011-02-221-34/+0
| * | Doc: correcting links in the online templatesMorten Engvoldsen2011-02-151-2/+1
| * | Doc: Updating platform support pages in the documentationMorten Engvoldsen2011-02-151-2/+1
* | | Merge remote-tracking branch 'origin/master' into qt-master-from-4.7Thiago Macieira2011-03-117-7/+7
|\ \ \
| * | | Update copyright year to 2011.Rohan McGovern2011-03-107-7/+7
* | | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Thiago Macieira2011-03-111-5/+5
|\ \ \ \ | |/ / / |/| | / | | |/ | |/|
| * | Bump Qt version to 4.7.3Timo Turunen2011-03-098-25/+25
| |/
* | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-02-1028-2506/+1171
|\ \ | |/
| * Doc: Updated the copyright statements in the templates.David Boddie2011-02-012-2/+2
| * Doc: Added a missing style sheet to the qhp manifest.David Boddie2011-01-281-1/+1
| * Doc: Fixed the qthelp namespace for the Qt documentation.David Boddie2011-01-281-1/+1
| * Removed a configuration file that can no longer be used.David Boddie2011-01-241-12/+0
| * Doc: Updated the Qt version number.David Boddie2010-12-211-4/+4
| * Doc: Fixed whitespace.David Boddie2010-12-213-11/+11
| * Updated the offline template to use a new offline style sheet.David Boddie2010-12-172-17/+10
| * 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
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | / / / / / / / | | |/ / / / / / / | |/| | | | | | |