summaryrefslogtreecommitdiffstats
path: root/tools/qdoc3/ditaxmlgenerator.h
Commit message (Collapse)AuthorAgeFilesLines
* Update copyright year in Digia's license headersSergio Ahumada2013-01-131-1/+1
| | | | | | Change-Id: I52bf8ef0447b701b4ebf7d7d240013a72adb9425 Reviewed-by: Akseli Salovaara <akseli.salovaara@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* Change copyrights from Nokia to DigiaIikka Eklund2012-09-291-24/+24
| | | | | | | | Change copyrights and license headers from Nokia to Digia Change-Id: I280c0a575987d1770e354b4948f1d4d767d711ea Reviewed-by: Simo Fält <simo.falt@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* Update contact information in license headers.Sergio Ahumada2012-08-011-2/+2
| | | | | | | | | | | | | - Replace Nokia contact email address with Qt Project website. - Remove "All rights reserved" line from license headers. As in the past, to avoid rewriting various autotests that contain line-number information, an extra blank line has been inserted at the end of the license text to ensure that this commit does not change the total number of lines in the license header. Change-Id: Ie7ba62011752fcb149b99b26317c54f2a0cfa931 Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
* 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-09-021-11/+0
| | | | | | | | | | (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
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2011-05-171-17/+17
|\ | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Updating file with CRLF line endings for the updated header Fix a regression in QList::mid() update gitignore remove -fno-stack-protector Fix make confclean Update licenseheader text in source files
| * 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
* | doc: Fixed QTBUG-18791Martin Smith2011-05-111-1/+1
|/
* qdoc: Completed task QTBUG-18733Martin Smith2011-04-141-4/+9
|
* qdoc: Allowed multiple values for certain metadata tags.Martin Smith2011-04-051-1/+3
| | | | | Also output mainters for classes in the HTML output, if there are maintainers listed.
* qdoc: Added default values to config file for DITAMartin Smith2011-03-251-1/+2
| | | | | | | | | | | 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
* qdoc: Completed metadata handling.Martin Smith2011-03-241-0/+4
| | | | But not the default values part in the config file.
* qdoc: Completed changing <section> structure.Martin Smith2011-03-171-7/+3
| | | | | | 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>.
* qdoc: Changed <section> structure.Martin Smith2011-03-151-14/+29
| | | | | | 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>.
* qdoc: Added <prodinfo> element and its contents to the metadata.Martin Smith2011-03-091-0/+2
|
* qdoc: Added Author> and <category> elements to the metadata.Martin Smith2011-03-071-0/+1
|
* qdoc: Added enum values and tag names for <prolog> and <metadata>Martin Smith2011-03-041-1/+28
| | | | These contain many subelements, whose tages were also added.
* Merge branch 'mimir' into 4.7David Boddie2011-02-231-1/+154
|\ | | | | | | | | | | | | | | | | | | | | 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-0/+2
| | | | | | | | 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-1/+2
| | | | | | | | 11 instances of raw-html remain.
| * qdoc: Added the \caption command.Martin Smith2011-01-131-0/+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-1/+150
| | | | | | | | Only 27 raw-html uses remaining.
* | 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
* | | Define what the -slow command line option does.David Boddie2011-01-181-1/+0
|/ / | | | | | | | | Added configuration options for syntax highlighting and linking. These are also enabled if the -slow command line option is used.
* | qdoc: Updated signature of generateInnerNode() in the XML generator.Martin Smith2010-12-091-1/+1
| |
* | Merge branch 'mimir' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into mimirMartin Smith2010-12-081-14/+14
|\ \
| * \ Merge branch 'qdoc-simplified' into mimir-simplifiedDavid Boddie2010-12-071-14/+14
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * | Added the foundations of QML markup support.David Boddie2010-11-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Use the QtDeclarative parser instead of Qt Creator's QML parser. Split the QML visitor into documentation and markup visitors. The code marker used for each file is now determined from its extension.
| | * | Removed unused code.David Boddie2010-11-241-3/+0
| | |/
* | | qdoc: Fixed the double escaping problem.Martin Smith2010-12-081-0/+1
|/ / | | | | | | | | | | | | | | It's sort of ugly, because it just removes the escapeing that the code marker puts in so the XML stream writer can put the escaping back in again. It doesn't seem to slow it down at all, which is wierd.
* | qdoc: Removed unused code.Martin Smith2010-11-101-3/+0
| |
* | <?xml version="1.0" encoding="UTF-8"?>Martin Smith2010-11-091-4/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | <!DOCTYPE topic PUBLIC "-//OASIS//DTD DITA Topic//EN" "dtd/topic.dtd"> <!--commercialeditions.qdoc--> <topic id="id-686f5cb9-31b5-470e-97e6-7b6f8d47e4e8" outputclass="page"> <title>Qt Commercial Edition</title> <shortdesc>Information about the license and features of the Commercial Edition.</shortdesc> <body> <section id="id-3680bc34-a532-447a-b782-1c901e84f41e" outputclass="details"> <p outputclass="brief">Information about the license and features of the Commercial Edition.</p> <p>Qt can be used to develop closed source software if you obtain a commercial license.</p> <p>If you want to develop Free or Open Source software for release using a recognized Open Source license, you can use the <xref href="opensourceedition.xml">Open Source Versions of Qt</xref>.</p> <p>The table below summarizes the differences between the two commercial editions:</p> <p>Please see the <xref href="supported-platforms.xml">list of supported platforms</xref> for up-to-date information about the various platforms and compilers that Qt supports.</p> <p>On the Qt web site, you can find a <xref href="http://qt.nokia.com/products/licensing/">Qt Licensing Overview</xref> and information on <xref href="http://qt.nokia.com/products/pricing/">Qt License Pricing</xref> for commercial editions of Qt and other Qt-related products.</p> <p>To purchase, please visit the <xref href="http://qt.nokia.com/about/contact-us">online order form</xref>.</p> <p>For further information and assistance, please contact Qt sales.</p> <p>Web: http://qt.nokia.com/contact.</p> <p>Phone, U.S&amp;#x2e; office (for North America): <b>1-650-813-1676</b>.</p> <p>Phone, Norway office (for the rest of the world): <b>+47 21 60 48 00</b>.</p> </section> </body> </topic>
* | qdoc: Removed unused code.Martin Smith2010-11-091-6/+0
| |
* | qdoc: First pass at generating a map.Martin Smith2010-11-051-0/+1
| | | | | | | | | | | | | | Some files are missing, and I don't know if the syntax is complete. But it's a start. Task-number: QTBUG-14981
* | qdoc: Added the <related-links> element to the <topic>Martin Smith2010-11-041-0/+2
| | | | | | | | | | | | | | This contains the next, previous, and start links for pages that have them. Task-number: QTBUG-14980
* | qdoc: Fixed some DITA XML validation errors.Martin Smith2010-10-281-6/+20
| | | | | | | | | | | | | | | | The obsolete and Qt3 support files no longer exist, so all the references to them had to be cleaned up, and the elements that were formerly in those files had to be included in the class, namespace, or header file with the appropriate outputclass attr.
* | qdoc: Fixed some DITA XML validation errors.Martin Smith2010-10-251-1/+1
| |
* | qdoc: Output the \headerfile as a <cxxClass>.Martin Smith2010-10-221-0/+1
| |
* | qdoc: Fixed <p> inside of <p> for legalese text.Martin Smith2010-10-181-0/+1
| |
* | qdoc: Added extraneous enum Definition File elementsMartin Smith2010-10-181-3/+0
| | | | | | | | Removed bread crumb generator from DITA XML generator.
* | qdoc: Changed GUIDs from "{xxxxxx}" to "id-xxxxxxx".Martin Smith2010-10-181-3/+0
| |
* | qdoc: Cleaned up a lot of unneeded outputclass attributes.Martin Smith2010-10-061-3/+1
| |
* | qdoc: Cleaned up a lot of redundant table stuff.Martin Smith2010-10-061-2/+1
| | | | | | | | Now just uses <ul> for redundant lists.
* | qdoc: Added the remaining names bits.Martin Smith2010-10-051-0/+3
| | | | | | | | Needs careful proofreading of results.
* | qdoc: Outputting each namespace as a <cxxClass> element.Martin Smith2010-10-041-1/+1
| | | | | | | | Still missing nested classes.
* | qdoc: Corrected output for the AutoLink case.Martin Smith2010-09-271-1/+1
| | | | | | | | Now many more <xref> elements are generated correctly.
* | qdoc: Corrected many GUIDs.Martin Smith2010-09-241-5/+6
| | | | | | | | Still more to do here.
* | qdoc: Removed some unused parameters.Martin Smith2010-09-221-16/+6
| |
generated by cgit v0.12 at 2025-09-08 17:40:33 (GMT)