summaryrefslogtreecommitdiffstats
path: root/tools/qdoc3/doc.cpp
Commit message (Collapse)AuthorAgeFilesLines
* qdoc: Allowed multiple values for certain metadata tags.Martin Smith2011-04-051-3/+4
| | | | | 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-011-8/+59
|
* qdoc: Completed metadata handling.Martin Smith2011-03-241-1/+1
| | | | But not the default values part in the config file.
* qdoc: Changed <section> structure.Martin Smith2011-03-151-2/+2
| | | | | | 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>.
* Merge branch 'mimir' into 4.7David Boddie2011-02-231-99/+135
|\ | | | | | | | | | | | | | | | | | | | | 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: Added the \span command.Martin Smith2011-01-241-35/+35
| | | | | | | | e.g. \span {id="color-red"} {Color this text only}, not this text.
| * qdoc: Fixed some validation errors in the DITA filesMartin Smith2011-01-191-18/+17
| | | | | | | | 11 instances of raw-html remain.
| * qdoc: Added colorizing of individual table cells.Martin Smith2011-01-141-68/+78
| |
| * qdoc: Added a parameter to \rowMartin Smith2011-01-131-1/+2
| | | | | | | | And removed some \raw cases. Only 11 raw-html uses remaining.
| * qdoc: Added the \caption command.Martin Smith2011-01-131-1/+1
| | | | | | | | | | And removed some \raw cases. Only 13 raw-html uses remaining. Added the figCaption clause to style.css.
| * qdoc: Replaced many raw-html cases with \div {something}.Martin Smith2011-01-121-7/+4
| | | | | | | | Only 22 raw-html uses remaining.
| * qdoc: Replaced many raw-html cases with \div {something}.Martin Smith2011-01-071-14/+36
| |
* | Ensured that \code commands do not reuse the current code marker.David Boddie2011-02-091-1/+1
| |
* | Ensured that trailing newlines are quoted and correct atoms are used.David Boddie2011-02-051-4/+13
| | | | | | | | | | | | Newlines after comments at the end of files were previously omitted. An assumption about the type code being quoted caused incorrect CSS classes to be used and extra HTML elements to be used.
* | Merge branch '4.7' into qdoc-simplifiedDavid Boddie2011-01-211-1/+1
|\ \ | | | | | | | | | | | | | | | Conflicts: src/declarative/graphicsitems/qdeclarativeitem.cpp src/declarative/util/qdeclarativeanimation.cpp
| * \ Merge branch '4.7' of ../qt into 4.7David Boddie2011-01-131-1/+1
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/declarative/qdeclarativeintro.qdoc doc/src/declarative/qdeclarativereference.qdoc doc/src/snippets/declarative/focus/focusColumn.qml tools/qdoc3/apigenerator.cpp tools/qdoc3/apigenerator.h tools/qdoc3/archiveextractor.cpp tools/qdoc3/bookgenerator.cpp tools/qdoc3/bookgenerator.h tools/qdoc3/ccodeparser.cpp tools/qdoc3/command.cpp tools/qdoc3/command.h tools/qdoc3/cpptoqsconverter.cpp tools/qdoc3/dcfsection.cpp tools/qdoc3/dcfsection.h tools/qdoc3/jambiapiparser.cpp tools/qdoc3/jambiapiparser.h tools/qdoc3/javacodemarker.cpp tools/qdoc3/javacodemarker.h tools/qdoc3/javadocgenerator.cpp tools/qdoc3/javadocgenerator.h tools/qdoc3/linguistgenerator.cpp tools/qdoc3/linguistgenerator.h tools/qdoc3/loutgenerator.h tools/qdoc3/mangenerator.cpp tools/qdoc3/mangenerator.h tools/qdoc3/polyarchiveextractor.cpp tools/qdoc3/polyarchiveextractor.h tools/qdoc3/polyuncompressor.cpp tools/qdoc3/polyuncompressor.h tools/qdoc3/qsakernelparser.cpp tools/qdoc3/qscodemarker.cpp tools/qdoc3/qscodemarker.h tools/qdoc3/qscodeparser.cpp tools/qdoc3/qscodeparser.h tools/qdoc3/sgmlgenerator.cpp tools/qdoc3/sgmlgenerator.h tools/qdoc3/test/qt-html-templates.qdocconf tools/qdoc3/uncompressor.cpp tools/qdoc3/webxmlgenerator.cpp tools/qdoc3/webxmlgenerator.h
| | * | Update copyright year to 2011.Jason McDonald2011-01-101-1/+1
| | | | | | | | | | | | | | | | Reviewed-by: Trust Me
* | | | Added a \js command for JavaScript code.David Boddie2011-01-201-0/+12
|/ / /
* | | Enabled error reporting and a plain text fallback for invalid QML.David Boddie2010-12-211-3/+3
| |/ |/| | | | | | | The location of places where code is included in documentation is now passed into each code marker when highlighted code is needed.
* | Treat div elements like paragraphs.David Boddie2010-12-141-0/+3
| |
* | Merge branch 'qdoc-simplified' into mimir-simplifiedDavid Boddie2010-12-141-5/+42
|\ \ | | | | | | | | | | | | | | | Conflicts: tools/qdoc3/atom.h tools/qdoc3/qdoc3.pro
| * | Fixed macro argument handling.David Boddie2010-12-131-5/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed macro definition parsing that confused someone into thinking that single backslashes would appear in macro definitions instead of control codes. Fixed a bug that caused only arguments in general macros to be handled. Enabled arguments in HTML macros.
* | | qdoc: Changed index.qdoc to use new \div commandMartin Smith2010-12-141-5/+18
| | | | | | | | | | | | | | | | | | | | | | | | This is necessary for the Mimir project, but it is also useful for writing html output in that now you can write the index page (and other such pages) using pure qdoc commands. i.e. you don't need to use raw html for this sort of thing anymore.
* | | Merge branch 'qdoc-simplified' into mimir-simplifiedDavid Boddie2010-12-071-494/+471
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/platforms/compiler-notes.qdoc tools/qdoc3/ditaxmlgenerator.cpp tools/qdoc3/ditaxmlgenerator.h tools/qdoc3/htmlgenerator.cpp tools/qdoc3/htmlgenerator.h tools/qdoc3/node.cpp tools/qdoc3/pagegenerator.h
| * | Forced the \qml command to use the QML code marker.David Boddie2010-12-061-2/+3
| | |
| * | Removed unnecessary include, fixed whitespace.David Boddie2010-11-291-469/+468
| | |
| * | Removed unused code.David Boddie2010-11-221-23/+0
| |/
* | doc: Fixed some DITA XML validation errors.Martin Smith2010-10-261-1/+1
| | | | | | | | Also fixed a bug in qdoc3 for html generation.
* | qdoc: Fixed some DITA XML validation errors.Martin Smith2010-10-201-2/+2
|/
* qdoc: Fixed the model/view programming page; tried a style change.Martin Smith2010-05-281-12/+0
|
* qdoc: Avoided putting bad chars in linksMartin Smith2010-04-201-4/+7
|
* Doc/qdoc: Use Chinese titles; canonicalize titles with non-ASCII chars.David Boddie2010-02-081-1/+2
| | | | | | | | | | The documentation root in the qdocconf file now refers to the Chinese title for the Tutorials page. Modified qdoc's function to canonicalize titles so that it preserves characters that outside the range of ASCII letters and numbers. Reviewed-by: Trust Me
* Update copyright year to 2010Jason McDonald2010-01-061-1/+1
| | | | Reviewed-by: Trust Me
* qdoc updates for QMLWarwick Allison2009-11-041-0/+4
| | | | Reviewed-by:Michael Brasser
* qdoc: Added a missing "/" in a "<h2>".Martin Smith2009-10-011-38/+45
|
* qdoc: Added \brief texts to all the since 4.6 functions.Martin Smith2009-09-211-3/+8
|
* qdoc: Added "since" 4.6 lists to the "What's New" page.Martin Smith2009-09-211-4/+8
| | | | In test/qt.qdocconf, change %VERSION% to 4.6, for example.
* Update license headers again.Jason McDonald2009-09-091-4/+4
| | | | Reviewed-by: Trust Me
* Merge branch '4.5' into 4.6Thiago Macieira2009-08-311-13/+13
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: demos/boxes/glshaders.cpp demos/boxes/vector.h demos/embedded/fluidlauncher/pictureflow.cpp demos/embedded/fluidlauncher/pictureflow.h doc/src/desktop-integration.qdoc doc/src/distributingqt.qdoc doc/src/examples-overview.qdoc doc/src/examples.qdoc doc/src/frameworks-technologies/dbus-adaptors.qdoc doc/src/geometry.qdoc doc/src/groups.qdoc doc/src/objecttrees.qdoc doc/src/platform-notes.qdoc doc/src/plugins-howto.qdoc doc/src/qt3support.qdoc doc/src/qtdbus.qdoc doc/src/qtdesigner.qdoc doc/src/qtgui.qdoc doc/src/qtmain.qdoc doc/src/qtopengl.qdoc doc/src/qtsvg.qdoc doc/src/qtuiloader.qdoc doc/src/qundo.qdoc doc/src/richtext.qdoc doc/src/topics.qdoc src/corelib/tools/qdumper.cpp src/gui/embedded/qkbdpc101_qws.cpp src/gui/embedded/qkbdsl5000_qws.cpp src/gui/embedded/qkbdusb_qws.cpp src/gui/embedded/qkbdvr41xx_qws.cpp src/gui/embedded/qkbdyopy_qws.cpp src/gui/embedded/qmousebus_qws.cpp src/gui/embedded/qmousevr41xx_qws.cpp src/gui/embedded/qmouseyopy_qws.cpp src/gui/painting/qpaintengine_d3d.cpp src/gui/painting/qwindowsurface_d3d.cpp src/opengl/gl2paintengineex/glgc_shader_source.h src/opengl/gl2paintengineex/qglpexshadermanager.cpp src/opengl/gl2paintengineex/qglpexshadermanager_p.h src/opengl/gl2paintengineex/qglshader.cpp src/opengl/gl2paintengineex/qglshader_p.h src/opengl/util/fragmentprograms_p.h src/plugins/kbddrivers/linuxis/linuxiskbdhandler.cpp src/plugins/mousedrivers/linuxis/linuxismousehandler.cpp src/script/parser/qscript.g src/script/qscriptarray_p.h src/script/qscriptasm_p.h src/script/qscriptbuffer_p.h src/script/qscriptclass.cpp src/script/qscriptclassdata_p.h src/script/qscriptcompiler.cpp src/script/qscriptcompiler_p.h src/script/qscriptcontext.cpp src/script/qscriptcontext_p.cpp src/script/qscriptcontext_p.h src/script/qscriptcontextfwd_p.h src/script/qscriptecmaarray.cpp src/script/qscriptecmaarray_p.h src/script/qscriptecmaboolean.cpp src/script/qscriptecmacore.cpp src/script/qscriptecmadate.cpp src/script/qscriptecmadate_p.h src/script/qscriptecmaerror.cpp src/script/qscriptecmaerror_p.h src/script/qscriptecmafunction.cpp src/script/qscriptecmafunction_p.h src/script/qscriptecmaglobal.cpp src/script/qscriptecmaglobal_p.h src/script/qscriptecmamath.cpp src/script/qscriptecmamath_p.h src/script/qscriptecmanumber.cpp src/script/qscriptecmanumber_p.h src/script/qscriptecmaobject.cpp src/script/qscriptecmaobject_p.h src/script/qscriptecmaregexp.cpp src/script/qscriptecmaregexp_p.h src/script/qscriptecmastring.cpp src/script/qscriptecmastring_p.h src/script/qscriptengine.cpp src/script/qscriptengine_p.cpp src/script/qscriptengine_p.h src/script/qscriptenginefwd_p.h src/script/qscriptextenumeration.cpp src/script/qscriptextenumeration_p.h src/script/qscriptextqobject.cpp src/script/qscriptextqobject_p.h src/script/qscriptextvariant.cpp src/script/qscriptfunction.cpp src/script/qscriptfunction_p.h src/script/qscriptgc_p.h src/script/qscriptmember_p.h src/script/qscriptobject_p.h src/script/qscriptprettypretty.cpp src/script/qscriptprettypretty_p.h src/script/qscriptvalue.cpp src/script/qscriptvalueimpl.cpp src/script/qscriptvalueimpl_p.h src/script/qscriptvalueimplfwd_p.h src/script/qscriptvalueiteratorimpl.cpp src/script/qscriptxmlgenerator.cpp src/script/qscriptxmlgenerator_p.h tests/auto/linguist/lupdate/testdata/recursivescan/project.ui tests/auto/linguist/lupdate/testdata/recursivescan/sub/finddialog.cpp tests/auto/qkeyevent/tst_qkeyevent.cpp tools/linguist/shared/cpp.cpp
| * Update tech preview license header.Jason McDonald2009-08-311-13/+13
| | | | | | | | Reviewed-by: Trust Me
| * Update license headers.Jason McDonald2009-08-111-1/+1
| | | | | | | | Reviewed-by: Trust Me
* | Update contact URL in license headers.Jason McDonald2009-08-121-1/+1
| | | | | | | | Reviewed-by: Trust Me
* | qdoc: Added \annotated list command to qdoc3.Martin Smith2009-08-041-14/+18
| | | | | | | | | | | | | | Now you can put "\annotatedlist xxx" anywhere in a qdoc comment, and it will generate the class list for the xxx group at that location. xxx must be a group name.
* | qdoc: Removed unnecessary error report/ruleMartin Smith2009-07-091-0/+3
| | | | | | | | | | | | | | | | qdoc reported an error if you used \section2 on its owin, i.e. with no outer \section1. While strictly speaking correct, it imposed an unnecessary restriction, e.g. sometimes you just want to use \section2 to get a smaller title for a section.
* | Merge license header changes from 4.5Volker Hilsheimer2009-06-161-2/+2
|\ \ | |/
| * Update license headers as requested by the marketing department.Jason McDonald2009-06-161-2/+2
| | | | | | | | Reviewed-by: Trust Me
* | Removed dead code ifdefed with QDOC2DOXMartin Smith2009-05-281-1978/+2
|/ | | | | | These changes were added to qdoc in the days when we thought we might switch to doxygen. Now we have taken the approach of making qdoc output be more doxygen-like, so this ifdefed code is now dead.
* Changed qdoc to simplify the output for overloaded functions.Martin Smith2009-05-251-3/+1
| | | | Task-number: 249222
* Long live Qt 4.5!Lars Knoll2009-03-231-0/+5036