summaryrefslogtreecommitdiffstats
path: root/tools/qdoc3
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7David Boddie2010-07-1623-389/+251
|\
| * Merge remote branch 'origin/4.7' into oslo-staging-1Aaron McCarthy2010-07-164-1/+75
| |\
| | * Docs: HTML comments marks so Creator can extract data efficiently.Leandro Melo2010-07-144-1/+75
| * | qdoc: Removed navigation arrow that was causing display problems.Martin Smith2010-07-142-12/+19
| * | Fixing merge conflicts.Martin Smith2010-07-132-8/+8
| |\ \ | | |/
| * | qdoc: Fixed several <div> elements that had the "/>" ending.Martin Smith2010-07-131-4/+4
| * | qdoc: Fixed breadcrumbs for QML examples.Martin Smith2010-07-131-6/+11
| * | Doc: Cleaning style and adding support for CreatorMorten Engvoldsen2010-07-094-26/+21
| * | Doc: fixing offline styleMorten Engvoldsen2010-07-091-7/+5
| * | Doc: Adding support for Qt Creator styleMorten Engvoldsen2010-07-093-2/+18
| * | qdoc: Marked some missing declarative properties and functions as \internal.Martin Smith2010-07-091-1/+2
| * | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-07-081-1/+1
| |\ \
| | * | Doc: documenting docsMorten Engvoldsen2010-07-081-1/+1
| * | | qdoc: Fixed broken QML property links.Martin Smith2010-07-082-2/+2
| |/ /
| * | Doc: more cleaningMorten Engvoldsen2010-07-081-24/+3
| * | Doc: fixing escape characterMorten Engvoldsen2010-07-081-1/+1
| * | Doc: cleaning html generatorMorten Engvoldsen2010-07-081-26/+0
| * | Doc: changing index pageMorten Engvoldsen2010-07-082-7/+46
| * | Doc: fixing link to devnetMorten Engvoldsen2010-07-081-1/+1
| * | Doc: adding HTML class names and style docs to the generatorMorten Engvoldsen2010-07-081-32/+34
| * | Doc: fixing typoMorten Engvoldsen2010-07-081-3/+2
| * | qdoc: Fixed table of contents for namespace pages.Martin Smith2010-07-081-1/+2
| * | qdoc: Fixed a few links to QtObject (QML:QtObject)Martin Smith2010-07-073-16/+10
| * | qdoc: Removed a lot of dead code to minimize confusion.Martin Smith2010-07-072-234/+1
| * | qdoc: Fixed the case where the property and type names are the same.Martin Smith2010-07-0714-50/+61
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7David Boddie2010-07-1210-489/+253
|\ \ \ | | |/ | |/|
| * | Replace 4.6 in all .qdocconf filesKai Koehne2010-07-092-8/+8
| |/
| * qdoc: Simplified code to enable fixing of QTBUG-6340.Martin Smith2010-07-063-410/+89
| * Doc: fixing search script and styleMorten Engvoldsen2010-07-051-1/+1
| * qdoc: Fixed type linking for QML properties (most of them).Martin Smith2010-07-053-4/+8
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7David Boddie2010-07-024-35/+38
| |\
| | * qdoc: Fixed spacing before "default" and "read-only".Martin Smith2010-07-022-7/+8
| | * Doc: Adding navigation and style fixes. Also rearranging qml elementsMorten Engvoldsen2010-07-012-25/+26
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-07-012-1/+2
| | |\
| | | * qdoc: Fixed invalid format in the html header.Martin Smith2010-07-011-1/+1
| | | * Stopped trying to output QML property list in 2 columnsMartin Smith2010-06-301-0/+1
| | * | update qml.qch to version 4.7mae2010-06-291-2/+2
| | |/
| * | qdoc: Added a solution for creating tables of contents for manuals.David Boddie2010-07-023-34/+112
| * | Doc: Fixed markup.David Boddie2010-06-301-1/+1
| |/
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7David Boddie2010-06-3014-173/+517
|\ \ | |/
| * Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-06-289-77/+131
| |\
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7David Boddie2010-06-288-86/+295
| | |\
| | * \ Merge branch '4.7' of /home/dboddie/git/oslo-staging-1 into 4.7David Boddie2010-06-2510-122/+428
| | |\ \
| | | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7David Boddie2010-06-234-20/+164
| | | |\ \
| | | * | | Doc: Fixed whitespace issues and added missing files to lists.David Boddie2010-06-233-67/+90
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/dboddies-oslo-staging-1-qdoc ...David Boddie2010-06-184-16/+254
| | |\ \ \ \
| | * | | | | qdoc: Added a workaround for QML/Qt class name clashes.David Boddie2010-06-186-10/+41
| * | | | | | doc: Added more DITA output to the XML generatorMartin Smith2010-06-282-16/+97
| | |_|_|_|/ | |/| | | |
| * | | | | doc: Added more DITA output to the XML generatorMartin Smith2010-06-281-0/+8
| * | | | | Fixed copy-paste error in htmlgenerator.cppRohan McGovern2010-06-261-1/+1