summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-staging into ↵Qt Continuous Integration System2011-03-2742-6883/+10890
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-staging: (185 commits) qdoc: Avoid infinite loops in table of contents generation. Removed the documentation from the install rule. qdoc: Added the <othermeta> element. qdoc: Completed changing <section> structure. Doc: Fixed reference to absolete API in exceptionsafety.html Doc: Removed links to obsolete API in QResource Doc: Fixed broken links in QIcon::fromTheme() Doc: Fixed doc bug in undo framework example Doc: Fixed typo. qdoc: Changed <section> structure. Doc: Typo fixes Doc: Fixed snippet documenting QMetaObject::classInfo Doc: Cannot alter SelectionMode of a combobox's view qdoc: Added <publisher> and <permissions> elements. qdoc: Added <component> element to contain the module name. qdoc: Added <prodinfo> element and its contents to the metadata. Doc: Fixed a doc bug in the Rogue example Doc: Small change to QByteArray::resize() Doc: Small change to ListModel docs Doc: QtDemo now gives error message when example doc cannot be loaded ...
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7David Boddie2011-03-2218-76/+159
| |\ | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/declarative/declarativeui.qdoc doc/src/declarative/dynamicobjects.qdoc doc/src/declarative/elements.qdoc doc/src/examples/qml-examples.qdoc
| * | qdoc: Avoid infinite loops in table of contents generation.David Boddie2011-03-211-1/+4
| | |
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2011-03-184-183/+185
| |\ \
| | * | qdoc: Added the <othermeta> element.Martin Smith2011-03-183-1/+30
| | | |
| | * | qdoc: Completed changing <section> structure.Martin Smith2011-03-172-182/+155
| | | | | | | | | | | | | | | | | | | | | | | | There appears to be a design flaw in the DITA language in that it doesn't allow the <title> element to appear inside a <bodydiv> <sectiondiv>.
| * | | Removed the documentation from the install rule.David Boddie2011-03-181-1/+1
| | | |
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2011-03-153-205/+264
| |\ \ \ | | |/ /
| | * | qdoc: Changed <section> structure.Martin Smith2011-03-153-205/+264
| | | | | | | | | | | | | | | | | | | | | | | | There appears to be a design flaw in the DIKT language in that it doesn't allow the <title> element to appear inside a <bodydiv> <sectiondiv>.
| * | | Doc: Fixed typo.David Boddie2011-03-151-1/+1
| | | |
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2011-03-144-14/+78
| |\ \ \ | | |/ /
| | * | qdoc: Added <publisher> and <permissions> elements.Martin Smith2011-03-103-9/+45
| | | |
| | * | qdoc: Added <component> element to contain the module name.Martin Smith2011-03-101-1/+6
| | | |
| | * | qdoc: Added <prodinfo> element and its contents to the metadata.Martin Smith2011-03-092-5/+28
| | | |
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2011-03-084-10/+162
| |\ \ \ | | |/ /
| | * | qdoc: Added Author> and <category> elements to the metadata.Martin Smith2011-03-074-25/+103
| | | |
| | * | qdoc: Added enum values and tag names for <prolog> and <metadata>Martin Smith2011-03-042-6/+81
| | | | | | | | | | | | | | | | These contain many subelements, whose tages were also added.
| | * | qdoc: Removed debug code.Martin Smith2011-03-021-1/+0
| | | |
| * | | Fixed invalid HTML output.David Boddie2011-03-031-1/+1
| |/ /
| * | Merge branch 'mimir' into 4.7Martin Smith2011-03-012-1595/+1739
| |\ \
| | * | qdoc: Added more descriptions for QML commands.Martin Smith2011-03-011-138/+156
| | | |
| | * | qdoc: Added more descriptions for QML commands.Martin Smith2011-03-011-239/+284
| | | |
| | * | qdoc: Added more descriptions for QML commands.Martin Smith2011-02-281-132/+126
| | | |
| | * | qdoc: Added more descriptions for QML commands.Martin Smith2011-02-281-8/+69
| | | |
| | * | qdoc: Added more descriptions for QML commands.Martin Smith2011-02-281-15/+95
| | | |
| | * | qdoc: Added more descriptions for QML commands.Martin Smith2011-02-251-10/+29
| | | |
| | * | qdoc: Began adding descriptions for QML commands.Martin Smith2011-02-252-4/+123
| | | |
| | * | qdoc: More updating command descriptions.Martin Smith2011-02-251-769/+695
| | | |
| | * | qdoc: More updating command descriptions.Martin Smith2011-02-241-169/+115
| | | |
| | * | qdoc: More updating command descriptions.Martin Smith2011-02-241-210/+186
| | | |
| | * | qdoc: More updating command descriptions.Martin Smith2011-02-241-133/+123
| | | |
| | * | qdoc: More updating command descriptions.Martin Smith2011-02-241-113/+105
| | | |
| | * | Merge branch 'mimir' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into mimirMartin Smith2011-02-241229-2094/+6243
| | |\ \
| | * | | qdoc: More updating command descriptions.Martin Smith2011-02-241-139/+117
| | | | |
| * | | | Merge commit 'refs/merge-requests/1113' of git://gitorious.org/qt/qt into ↵David Boddie2011-02-281-0/+5
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | merge-requests/1113 Conflicts: doc/src/development/qmake-manual.qdoc
| * \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2011-02-241-316/+306
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| | * | | | Merge branch '4.7' into mimirMorten Engvoldsen2011-02-231229-2094/+6243
| | |\ \ \ \ | | | |_|/ / | | |/| | |
| | * | | | qdoc: More updating command descriptions.Martin Smith2011-02-231-25/+74
| | | | | |
| | * | | | qdoc: More updating command descriptions.Martin Smith2011-02-231-34/+11
| | | | | |
| | * | | | qdoc: More updating command descriptions.Martin Smith2011-02-231-257/+221
| | | | | |
| * | | | | Merge commit 'refs/merge-requests/1108' of git://gitorious.org/qt/qt into ↵David Boddie2011-02-238-53/+104
| |\ \ \ \ \ | | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | merge-requests/1108 Conflicts: doc/src/declarative/basictypes.qdoc
| * | | | | Merge branch 'mimir' into 4.7David Boddie2011-02-237-4999/+4877
| |\ \ \ \ \ | | | |/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/declarative/qdeclarativemodels.qdoc doc/src/index.qdoc doc/src/template/style/style.css tools/qdoc3/atom.h tools/qdoc3/doc.cpp tools/qdoc3/doc/qdoc-manual.qdoc tools/qdoc3/doc/qdoc-manual.qdocconf
| | * | | | qdoc: More updating command descriptions.Martin Smith2011-02-221-111/+80
| | | | | |
| | * | | | qdoc: More updating command descriptions.Martin Smith2011-02-221-89/+71
| | | | | |
| | * | | | qdoc: More updating command descriptions.Martin Smith2011-02-221-20/+15
| | | | | |
| | * | | | qdoc: More updating command descriptions.Martin Smith2011-02-221-83/+77
| | | | | |
| | * | | | qdoc: More updating command descriptions.Martin Smith2011-02-221-86/+72
| | | | | |
| | * | | | qdoc: More updating command descriptions.Martin Smith2011-02-221-177/+169
| | | | | |
| | * | | | qdoc: More updating command descriptions.Martin Smith2011-02-211-100/+101
| | | | | |
| | * | | | qdoc: More updating command descriptions.Martin Smith2011-02-211-140/+67
| | | | | |