summaryrefslogtreecommitdiffstats
path: root/tools/qdoc3
Commit message (Expand)AuthorAgeFilesLines
...
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Thiago Macieira2010-09-218-61/+56
|\ \ | |/
| * Doc: removing linebreakMorten Engvoldsen2010-09-161-1/+0
| * Doc: correcting html templateMorten Engvoldsen2010-09-161-12/+3
| * Merge branch '13092010doc' into doc-4.7Morten Engvoldsen2010-09-161-4/+4
| |\
| | * Doc: Removing google analytics from offline docsMorten Engvoldsen2010-09-162-15/+5
| | * Doc: correcting html template - validatingMorten Engvoldsen2010-09-161-1/+1
| | * Doc: correcting html templateMorten Engvoldsen2010-09-161-28/+22
| * | 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
| * | qdoc: Fixed an html formatting error in the QML property list.Martin Smith2010-09-151-21/+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-1014-124/+142
|\ \ \ | | |/ | |/|
| * | 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
| |/
| * QString usage cleanupsOswald Buddenhagen2010-09-011-1/+1
| * make qdoc3 boot-strappable againHarald Fernengel2010-08-301-0/+1
| * Doc: Whitespace fixes.David Boddie2010-08-271-23/+23
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-08-302-6/+16
|\ \ | |/
| * qdoc: Fixed erroneous links to QML basic types.Martin Smith2010-08-251-2/+9
| * Doc: Updating menu linksMorten Engvoldsen2010-08-231-4/+7
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-08-256-49/+167
|\ \ | |/
| * 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 branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Morten Engvoldsen2010-08-201-5/+4
| |\
| | * qdoc: Changed id attribute to be a UUID.Martin Smith2010-08-201-5/+4
| * | Doc: fixing creator bugs, removing menus and textbox in the headerMorten Engvoldsen2010-08-201-6/+7
| |/
| * qdoc: Added more elements to qt.pageindexMartin Smith2010-08-191-0/+29
| * qdoc3: Added more pagewords & elements to the search index.Martin Smith2010-08-191-3/+3
| * qdoc3: Added more pagewords & elements to the search index.Martin Smith2010-08-191-0/+6
| * qdoc: Reorganized the QML elements table to be a dictionary...Martin Smith2010-08-182-35/+95
| * qdoc: Reorganized the QML elements table to be a dictionary...Martin Smith2010-08-163-0/+21
| * qdoc: Added the fix to change qml-qml-file.name to qml-file.nameMartin Smith2010-08-131-3/+3
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-08-1322-231/+487
|\ \ | |/
| * Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-08-123-41/+171
| |\
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-08-128-23/+111
| | |\
| | * \ Merge commit 'remotes/origin/4.7' into qt47s2Thomas Zander2010-08-111-2/+2
| | |\ \
| | * \ \ Merge remote branch 'origin/4.7' into oslo-staging-2/4.7Olivier Goffart2010-08-0915-146/+160
| | |\ \ \
| | * \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7David Boddie2010-08-051-3/+3
| | |\ \ \ \
| | * | | | | 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-0424-236/+615
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7David Boddie2010-07-1623-389/+251
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7David Boddie2010-07-1210-489/+253
| | |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7David Boddie2010-06-3014-173/+517
| | |\ \ \ \ \ \ \ \
| | * | | | | | | | | Doc: Synchronize HTML templates for each language.David Boddie2010-06-283-37/+170
| * | | | | | | | | | qdoc: All references to -assistant and -base were removed.Martin Smith2010-08-123-29/+5
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
| * | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7David Boddie2010-08-119-17/+165
| |\ \ \ \ \ \ \ \ \