summaryrefslogtreecommitdiffstats
path: root/tools/qdoc3
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2011-04-091-1/+1
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2011-04-081-1/+1
| |\ | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: make -markuntranslated work without -idbased fix conditional on shell type
| | * fix conditional on shell typeOswald Buddenhagen2011-04-081-1/+1
| | |
* | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-04-0751-312/+13785
|\ \ \ | |/ / | | | | | | | | | | | | Conflicts: src/gui/text/qfontengine_mac.mm tests/auto/qdiriterator/tst_qdiriterator.cpp
| * | Fixed the declarative headers and includes within qdoc.David Boddie2011-04-0522-56/+56
| | |
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2011-04-0512-102/+346
| |\ \
| | * | qdoc: Allowed multiple values for certain metadata tags.Martin Smith2011-04-059-44/+152
| | | | | | | | | | | | | | | | | | | | Also output mainters for classes in the HTML output, if there are maintainers listed.
| | * | qdoc: modified \include to take a 2nd arg, snippet id.Martin Smith2011-04-014-33/+123
| | |/
| | * qdoc: Updates to the qdoc manual.Martin Smith2011-03-301-25/+71
| | |
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2011-03-297-69/+116
| |\ \ | | |/
| | * qdoc: Updates to the qdoc manual.Martin Smith2011-03-281-53/+38
| | |
| | * qdoc: Added a way to exclude directories from receiving default metadataMartin Smith2011-03-281-0/+20
| | | | | | | | | | | | But it is ifdefed out because I think we won't use it.
| | * Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Martin Smith2011-03-2520-35/+12902
| | |\
| | * | qdoc: Added default values to config file for DITAMartin Smith2011-03-255-16/+58
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also added the handling of these default values: dita.metadata.default.author = Qt Development Frameworks dita.metadata.default.permissions = all dita.metadata.default.publisher = Nokia dita.metadata.default.copyryear = 2011 dita.metadata.default.copyrholder = Nokia dita.metadata.default.audience = programmer
| * | | Removed some links and prettified others.David Boddie2011-03-251-12/+26
| | |/ | |/|
| * | Avoided the use of hard-coded file names.David Boddie2011-03-241-34/+70
| | |
| * | Copied the declarative parser into qdoc3 to avoid dependency issues.David Boddie2011-03-2419-1/+12832
| |/
| * qdoc: Don't wrap <image> in <fig> if in an <xref>Martin Smith2011-03-241-2/+4
| |
| * qdoc: Added <copyright>, <copyryear>, and <copyrholder>.Martin Smith2011-03-241-3/+19
| |
| * Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Martin Smith2011-03-2416-39/+299
| |\
| | * Merge branch 'clone_4.7' into 4.7Jerome Pasion2011-03-236-6/+263
| | |\
| | | * Adopting changes from a merge with qt-doc-team repo, 4.7 branchJerome Pasion2011-03-223-3/+3
| | | |
| | | * Merge remote branch 'remotes/qt-doc-team/4.7' into 4.7Jerome Pasion2011-03-185-321/+382
| | | |\
| | | * | Edited QtWebKit Guide CSS chapter. Created example links.Jerome Pasion2011-03-175-6/+262
| | | | | | | | | | | | | | | | | | | | Reviewed-by: David Boddie
| | | * | Adding QtWebKit Guide (BETA).Jerome Pasion2011-03-151-0/+1
| | | | | | | | | | | | | | | | | | | | Added images, new doc build configurations, and example code.
| * | | | qdoc: Completed metadata handling.Martin Smith2011-03-248-126/+152
| | |_|/ | |/| | | | | | | | | | But not the default values part in the config file.
* | | | 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
| | |