summaryrefslogtreecommitdiffstats
path: root/tools/qdoc3/test
Commit message (Expand)AuthorAgeFilesLines
* 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
| |\ \ | | |/
| * | Doc: Added dual documentation license information to the HTML templates.David Boddie2010-09-063-0/+27
* | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-09-1012-123/+140
|\ \ \ | | |/ | |/|
| * | Doc: fixing page name bug caused by 07bbace404078dcfd82eff717daa97299b8ba52c ...Morten Engvoldsen2010-09-071-1/+1
| * | Doc: updating the qdocconf files and the stylesheetMorten Engvoldsen2010-09-0712-99/+116
| * | Doc: Fixing links on index page and corecting HTML in the template.Morten Engvoldsen2010-09-031-1/+1
| |/
| * Doc: Whitespace fixes.David Boddie2010-08-271-23/+23
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-08-301-4/+7
|\ \ | |/
| * Doc: Updating menu linksMorten Engvoldsen2010-08-231-4/+7
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-08-251-4/+6
|\ \ | |/
| * Doc: changing template menus to better reflect links from the index page.Morten Engvoldsen2010-08-221-3/+5
| * Doc: Changes to the index page and second level pages linking to the index page.Morten Engvoldsen2010-08-201-1/+1
* | 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