summaryrefslogtreecommitdiffstats
path: root/tools/qdoc3
Commit message (Expand)AuthorAgeFilesLines
* Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-01-1794-96/+96
|\
| * Update copyright year to 2011.Jason McDonald2011-01-1093-93/+93
| * 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-195-13/+27
| |\ \
* | \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into master-s60axis2010-11-1910-30/+43
|\ \ \ \ | |/ / / |/| | / | | |/ | |/|
| * | Merge remote branch 'qt/4.7' into 4.7Jason McDonald2010-11-185-14/+27
| |\ \ | | |/
| | * qdoc: Added QML Elements to the Assistant indexMartin Smith2010-11-113-10/+20
| | * Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Martin Smith2010-11-112-3/+3
| | |\
| | * | qdoc: Fixed virtualness and constness of the fileBase() function.Martin Smith2010-11-112-4/+7
| * | | Bump Qt version to 4.7.2.Jason McDonald2010-11-1212-40/+40
| | |/ | |/|
* | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-11-124-40/+229
|\ \ \ | |/ /
| * | Doc: Fixing typoSergio Ahumada2010-11-091-1/+1
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-11-082-3/+3
| |\ \ | | |/ | |/|
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-11-052-3/+3
| | |\
| | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-11-032-3/+3
| | | |\
| | | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-11-032-3/+3
| | | | |\
| | | | | * Doc: Fixing typoSergio Ahumada2010-11-012-3/+3
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2010-11-051-2/+2
| |\ \ \ \ \
| | * | | | | Doc: adding html clasnames to the next and previous linksMorten Engvoldsen2010-11-041-2/+2
| | |/ / / /
| * | | | | Doc: Updated the configuration file to use the Qt 4.7 style sheets.David Boddie2010-11-051-34/+219
| * | | | | qdoc: Remove leading QML: text from certain node names.David Boddie2010-11-041-1/+5
| |/ / / /
* | | | | Ensured that the document nodes are sorted in the generated index.David Boddie2010-11-081-2/+69
* | | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-11-051-1/+1
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Morten Engvoldsen2010-11-041-2/+2
| |\ \ \ \ | | |/ / /
| * | | | Doc: Correcting character escape bugMorten Engvoldsen2010-11-041-1/+1
* | | | | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-11-042-4/+34
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/doc-staging into 4.7-integrationQt Continuous Integration System2010-11-032-4/+34
| |\ \ \ \ | | |/ / / | | | / / | | |/ / | |/| |
| | * | qdoc: Added next and previous links to top of pages.Martin Smith2010-11-031-3/+1
| | * | Doc: updating the template to support search feature better.Morten Engvoldsen2010-11-031-1/+33
| | |/
* | | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-11-031-2/+2
|\ \ \ | |/ /
| * | fix qdoc doc generationOswald Buddenhagen2010-11-011-2/+2
| |/
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-10-254-75/+74
|\ \ | |/
| * Doc: fixing unclosed <p>Morten Engvoldsen2010-10-151-1/+1
| * Added Q_INVOKABLE to ignore file.Jerome Pasion2010-10-081-2/+3
| * qdoc: Don't generate html output for png files.Martin Smith2010-10-071-2/+2
| * Doc: Fixed the in-repository licenses for the documentation.David Boddie2010-10-041-5/+5
| * Doc: Removed a superfluous comment.David Boddie2010-10-041-1/+0
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2010-09-3014-89/+68
| |\
| * | Doc: Fixed non-well-formed table output.David Boddie2010-09-241-1/+1
| * | Doc: Fixed coding style breakage in qdoc source code.David Boddie2010-09-231-65/+64
* | | 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-282-47/+19
| |\ \
| | * | 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-042-18/+21
|\ \ \ \ | | |/ / | |/| |
| * | | Added a condition to skip obsolete functions during the threadness check.Jerome Pasion2010-09-241-16/+19
| |/ /
| * | Doc: maintainance - fixing grammar and spellingMorten Engvoldsen2010-09-231-2/+2
* | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Thiago Macieira2010-09-221-4/+4
|\ \ \ | |/ /
| * | Bump version to 4.7.1.Jason McDonald2010-09-2112-40/+40
| |/