summaryrefslogtreecommitdiffstats
path: root/tools/qdoc3
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-03-3137-6866/+10873
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/declarative/example-slideswitch.qdoc doc/src/development/qmake-manual.qdoc doc/src/snippets/code/doc_src_qmake-manual.pro doc/src/snippets/code/doc_src_qtscript.qdoc src/corelib/animation/qabstractanimation.cpp src/s60installs/bwins/QtOpenGLu.def src/s60installs/eabi/QtOpenGLu.def src/s60installs/eabi/QtOpenVGu.def tests/auto/qdir/qdir.pro tests/auto/qsslsocket/tst_qsslsocket.cpp tools/qdoc3/doc/qdoc-manual.qdocconf
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7David Boddie2011-03-229-29/+29
| |\ | | | | | | | | | | | | | | | | | | | | | 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
| |/ /
| * | 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-2492-855/+4888
| |\ \
| | * \ Merge branch '4.7' into mimirMorten Engvoldsen2011-02-2392-855/+4888
| | |\ \
| | | * \ 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
| | | * | | Doc: Fixed handling of versioned properties and added documentation.David Boddie2011-02-223-85/+79
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-13451
| | | * | | Doc: Removed help project declarations in the online configuration.David Boddie2011-02-221-34/+0
| | | | | |
| | | * | | Added a build rule for the qdoc3 manual.David Boddie2011-02-171-3/+17
| | | | | |
| | | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2011-02-171-4/+2
| | | |\ \ \
| | | | * | | Doc: correcting links in the online templatesMorten Engvoldsen2011-02-151-2/+1
| | | | | | |
| | | | * | | Doc: Updating platform support pages in the documentationMorten Engvoldsen2011-02-151-2/+1
| | | | | | |
| | | * | | | Ensured that variables are scanned when generating the help index.David Boddie2011-02-151-0/+8
| | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Style option classes with obsolete variables had no obsolete pages in the compiled help files because, without other obsolete members to represent them, those pages were not added to the help project.
| | | * | | Doc: Added new configuration files for the qdoc manual.David Boddie2011-02-1423-234/+3969
| | | | | |
| | | * | | Ensured that \code commands do not reuse the current code marker.David Boddie2011-02-091-1/+1
| | | | | |
| * | | | | qdoc: More updating command descriptions.Martin Smith2011-02-241-139/+117
| |/ / / /
| * | | | 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
| | |/ / | |/| |
| * | | 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
| | | |