summaryrefslogtreecommitdiffstats
path: root/tools/qdoc3/generator.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Update year in Nokia copyright messages.Jason McDonald2012-01-111-1/+1
| | | | | | | | | Simple search and replace. This commit doesn't touch 3rd-party files, nor translations (where the change is not so simple and will be handled in a separate commit). Change-Id: I4e48513b8078a44a8cd272326685b25338890148 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Modified \since command behavior slightly to handle project and version.David Boddie2011-08-301-7/+135
| | | | | | | | | | (The since argument can contain a project name and version, defaulting to the qdoc project if only a version number is specified.) Refactored common code into the Generator class. Fixed \sincelist HTML generation for tables containing only one item. (cherry picked from commit 6a2f18140bbc41207eb2f5e2323b699600d89606) Reapplied after bad v4.7.4 merge
* qdoc: Fixed QTBUG-19338Martin Smith2011-08-301-4/+7
| | | | | | (cherry picked from commit 1ea0e706981006c48ad16a1ff8051df03610f20b) Reapplied after bad v4.7.4 merge
* Update licenseheader text in source filesJyri Tahtela2011-05-131-17/+17
| | | | | | | Updated version of LGPL and FDL licenseheaders. Apply release phase licenseheaders for all source files. Reviewed-by: Trust Me
* qdoc: Allowed multiple values for certain metadata tags.Martin Smith2011-04-051-3/+74
| | | | | Also output mainters for classes in the HTML output, if there are maintainers listed.
* Added a configuration variable for the QML documentation file prefix.David Boddie2011-02-031-0/+16
| | | | | | | | | This required a certain amount of refactoring to make the new variable visible to the relevant parts of the code. I also moved the fullDocumentLocation() function into the HtmlGenerator class, where it belongs. Task-number: QTBUG-17071
* 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
* | | Ongoing improvements and fixes to syntax highlighting.David Boddie2011-01-201-18/+10
|/ / | | | | | | | | | | | | | | | | | | Added an atom for JavaScript code. Fixed example file quoting to use the appropriate atom for each file. Changed C++ code marking to mark up classes as types. Fixed C++ quoting bug that caused the last character to be lost. Fixed indentation of code to not insert spaces inside elements. Documented the change in the meaning of the \c command. Simplified the use of CSS classes in the HTML output.
* | Merge branch 'qdoc-simplified' into mimir-simplifiedDavid Boddie2010-12-071-68/+46
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | Select the appropriate code marker for each file.David Boddie2010-12-011-1/+1
| | |
| * | Removed unused code.David Boddie2010-11-221-13/+1
| | |
| * | Further simplifications to qdoc3.David Boddie2010-11-191-29/+0
| | | | | | | | | | | | | | | | | | | | | Removed the unused ApiGenerator class. Removed archive and uncompression support not used in Qt. Removed the unused WebXML generator used to dump documentation as XML for an ancient documentation Web project.
| * | Started fixing qdoc's output to use some kind of page templates.David Boddie2010-11-111-38/+45
| |/ | | | | | | | | | | | | Removed hard-coded style and script information. Split .qdocconf files to help separate content and presentation. Task-number: QTBUG-15208
* | Merge branch '4.7' into mimirMorten Engvoldsen2010-09-291-16/+19
|\ \ | |/
| * Added a condition to skip obsolete functions during the threadness check.Jerome Pasion2010-09-241-16/+19
| | | | | | | | | | Reviewed-by: David Boddie Task:QTBUG-13786
* | qdoc: DITA XML generator now uses <section> elements...Martin Smith2010-09-181-46/+26
| | | | | | | | | | | | ...instead of <p> elements with the outputclass attribute set to some h value. Also added some missing macros to qt-ditaxml.qdocconf, but there is more to think about here.
* | qdoc: Generate more xml for group pages.Martin Smith2010-09-091-1/+5
| |
* | qdoc: Generate xml for more kinds of pages.Martin Smith2010-09-081-4/+9
|/ | | | Not complete.
* doc: Fixed some qdoc errors.Martin Smith2010-08-061-2/+5
|
* qdoc: Changed qdoc to output the new doc format.Martin Smith2010-04-091-2/+55
| | | | Very cool.
* qdoc: Added many png, js, and css files for new format.Martin Smith2010-04-071-0/+2
| | | | | | Coming soon! Task: QTBUG-9504
* Fix bad mergeOlivier Goffart2010-03-251-15/+7
|
* Merge remote branch 'origin/4.7' into 4.7Olivier Goffart2010-03-251-2/+10
|\ | | | | | | | | | | Conflicts: tools/qdoc3/generator.cpp tools/qdoc3/node.cpp
| * qdoc3: Fixed some ifdef typos and removed some whitespace.Martin Smith2010-03-171-4/+4
| |
* | Fix warnings and build on mingwThierry Bastian2010-03-251-2/+2
|/
* qdoc: ifdefed out all the debug code.Martin Smith2010-03-151-1/+4
| | | | | I think the crash that occurs when running qdoc over multiple qdocconf files is fixed.
* qdoc: Added debug code.Martin Smith2010-03-111-0/+1
|
* qdoc: Clear a static multimap after each qdocconf file.Martin Smith2010-03-081-0/+1
| | | | Task: QTBUG-8804
* qdoc3: Trying to find a bug that causes a crash.Martin Smith2010-03-031-7/+3
| | | | | | | | It doesn't crash on OS X, but it does on some other platforms. If you run into this crash running qdoc3, you can work around it by commenting out line 1539 in tools/qdoc3/htmlgenerator.cpp The line to comment out is: generateQmlInheritedBy(qml_cn, marker);
* Merge remote branch 'berlin/4.7' into 4.7Oswald Buddenhagen2010-03-021-1/+0
|\
| * Introduce optional qdoc_bootstrapped qmake flagHarald Fernengel2010-03-011-1/+0
| | | | | | | | | | | | | | This allows building documentation even when cross-compiling. Note that for official documentation, you should always use your host's qdoc3 binary. This qmake option is for testing whether you introduced new qdoc warnings even if you don't have a native build around.
* | qdoc: Second attempt, QML doc stuff.Martin Smith2010-03-021-0/+29
|/ | | | | | | | | | | | | This change caused a crash on several platforms before, but not on mine, of course. It outputs a list of new QML elements on the What's New in 4.7 page, and it outputs the "Inherited by" list on each QML elemnent page for elements that are inherited by other elements. I can't see why it should crash anything, but I have included some debug output. I think the crash might have something to do with QList<T>, which qdoc3 uses heavily. If it crashes for you, please get a stack trace and the debug output.
* Revert "qdoc: Finished "Inherited by" list for QML elements."Andreas Aardal Hanssen2010-02-251-26/+0
| | | | | | This reverts commit 83d7242271cf8196a8133de0406788135e16abbb. Reviewed-by: Martin Smith
* Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1David Boddie2010-02-191-0/+26
|\
| * qdoc: Finished "Inherited by" list for QML elements.Martin Smith2010-02-191-0/+26
| | | | | | | | | | | | The listed elements are now links. Task: QTBUG-8153
* | Doc: Simplified Commercial Editions for Qt 4.7.David Boddie2010-02-191-27/+0
|/ | | | | Reviewed-by: Trust Me Requested-by: Sales and Legal
* Update copyright year to 2010Jason McDonald2010-01-061-1/+1
| | | | Reviewed-by: Trust Me
* doc: Final fix. Example image links now display the image.Martin Smith2009-12-151-1/+41
| | | | Task-number: QTBUG-4484
* doc: Fixed erroneous qdoc error message.Martin Smith2009-12-141-4/+1
| | | | | | | qdoc reported a "No documentation" error for images used in examples, but these images aren't supposed to have documentation. Task-number: QTBUG-4484
* doc: Example page now lists images used by the exampleMartin Smith2009-12-041-23/+71
| | | | | | | It just links to an empty page at the moment, i.e., it doesn't load the images. But I will add that. Task-number: QTBUG-4484
* Doc: Removed the old Console edition and updated edition naming.David Boddie2009-10-011-11/+4
| | | | Reviewed-by: Trust Me
* Remove distinction between different editions in docs.Jason McDonald2009-09-221-6/+3
| | | | | | | We now generate only one set of docs, for the qt-everywhere package. Thus we no longer need to differentiate the different editions. Reviewed-by: Trust Me
* 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: List the NOTIFY signal function in the property doc.Martin Smith2009-08-101-1/+1
| |
generated by cgit v0.12 at 2025-01-13 12:14:27 (GMT)