summaryrefslogtreecommitdiffstats
path: root/tools/qdoc3/test
Commit message (Expand)AuthorAgeFilesLines
* Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-08-1312-127/+234
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-08-121-1/+2
| |\
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7David Boddie2010-08-111-4/+5
| | |\
| | * | qdoc: Fixed non-well-formed markup.David Boddie2010-08-091-1/+2
| * | | Merge remote branch 'origin/4.7' into oslo-staging-2/4.7Olivier Goffart2010-08-099-28/+5
| |\ \ \ | | | |/ | | |/|
| | * | Doc: Fixing validation bugsMorten Engvoldsen2010-08-061-4/+5
| | |/
| | * qdoc: Removed three unused config variables.Martin Smith2010-08-058-24/+0
| * | Doc: Fixed qdoc warnings.David Boddie2010-08-051-5/+2
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7David Boddie2010-08-0412-88/+143
| |\ \ | | |/
| | * Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Morten Engvoldsen2010-08-026-58/+57
| | |\
| | | * doc: Fixed many qdoc errors.Martin Smith2010-08-021-0/+1
| | | * qdoc: Removed exclusion of declarative directories in qt-api-only.qdocconfMartin Smith2010-08-025-58/+56
| | * | Doc: adding changes to getting started and fixing redirection linksMorten Engvoldsen2010-08-021-1/+1
| | |/
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7David Boddie2010-07-165-30/+24
| |\ \
| * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7David Boddie2010-07-123-8/+10
| |\ \ \
| * \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7David Boddie2010-06-304-69/+94
| |\ \ \ \
| * | | | | Doc: Synchronize HTML templates for each language.David Boddie2010-06-283-37/+170
* | | | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-07-2812-64/+114
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | Fixed the following sub-tasks for QTBUG-12192Kevin Wright2010-07-269-1/+27
| * | | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-07-224-34/+62
| |\ \ \ \ \
| | * \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7David Boddie2010-07-163-20/+22
| | |\ \ \ \ \ | | | | |_|_|/ | | | |/| | |
| | * | | | | Doc: Excluded the QML documentation from the Qt-only set.David Boddie2010-07-163-0/+21
| | * | | | | Doc: Whitespace fixes.David Boddie2010-07-161-41/+41
| * | | | | | qdoc: Fixed reporting of read-only status for QML properties.Martin Smith2010-07-221-1/+3
| | |/ / / / | |/| | | |
| * | | | | Fixing merge conflicts.Martin Smith2010-07-131-3/+3
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| * | | | | Doc: Cleaning style and adding support for CreatorMorten Engvoldsen2010-07-093-24/+19
| | |/ / / | |/| | |
| * | | | qdoc: Marked some missing declarative properties and functions as \internal.Martin Smith2010-07-091-1/+2
| * | | | Doc: fixing escape characterMorten Engvoldsen2010-07-081-1/+1
| * | | | Doc: changing index pageMorten Engvoldsen2010-07-081-1/+0
| * | | | Doc: fixing link to devnetMorten Engvoldsen2010-07-081-1/+1
| * | | | Doc: fixing typoMorten Engvoldsen2010-07-081-3/+2
* | | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Thiago Macieira2010-07-153-8/+10
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Replace 4.6 in all .qdocconf filesKai Koehne2010-07-091-3/+3
| |/ / /
| * | | Doc: fixing search script and styleMorten Engvoldsen2010-07-051-1/+1
| * | | qdoc: Fixed spacing before "default" and "read-only".Martin Smith2010-07-021-0/+2
| * | | Doc: Adding navigation and style fixes. Also rearranging qml elementsMorten Engvoldsen2010-07-011-1/+1
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-07-011-1/+1
| |\ \ \
| | * | | qdoc: Fixed invalid format in the html header.Martin Smith2010-07-011-1/+1
| | | |/ | | |/|
| * | | update qml.qch to version 4.7mae2010-06-291-2/+2
| |/ /
* | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Thiago Macieira2010-07-0110-90/+573
|\ \ \ | |/ /
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7David Boddie2010-06-281-2/+4
| |\ \
| | * | Doc: fixing search bugMorten Engvoldsen2010-06-251-2/+4
| | |/
| * | Doc: Fixed whitespace issues and added missing files to lists.David Boddie2010-06-233-67/+90
| |/
| * Doc: Fixing bugs to style and scriptMorten Engvoldsen2010-06-212-11/+11
| * Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-06-1129-77/+604
| |\
| | * Doc: Fixed whitespace in the other configuration file for zh_CN.David Boddie2010-06-071-22/+22
| | * Doc: Fixed whitespace in the Simplified Chinese doc configuration.David Boddie2010-06-071-26/+26
| | * * Add Japanese tutorial documentsTakumi ASAKI2010-06-078-0/+447
| * | doc: Added DITA XML generatorMartin Smith2010-06-111-0/+11
* | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-06-0824-30/+110
|\ \ \ | | |/ | |/|