summaryrefslogtreecommitdiffstats
path: root/tools/qdoc3/ditaxmlgenerator.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>
* Fix a bug where 'int' is not printed in snippets.Casper van Donderen2011-12-191-1/+2
| | | | Reviewed-By: Trust Me
* Merge remote-tracking branch 'origin/4.8' into qt-4.8-from-4.7Liang Qi2011-09-031-19/+0
|\ | | | | | | | | Conflicts: tools/qdoc3/htmlgenerator.cpp
| * Modified \since command behavior slightly to handle project and version.David Boddie2011-09-021-83/+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.8 into qt-4.8-from-4.7Sergio Ahumada2011-09-011-3/+24
|\ \ | |/ | | | | | | | | Conflicts: tools/qdoc3/ditaxmlgenerator.cpp tools/qdoc3/htmlgenerator.cpp
| * qdoc3: Updates for QTBUG-20739 (no read-only for QML components)Martin Smith2011-08-111-1/+2
| | | | | | | | Task-number: QTBUG-20739
| * qdoc: Check pointer for null before dereferencing.Martin Smith2011-08-031-2/+3
| | | | | | | | Task-number: QTBUG-20725
| * qdoc3: Write "Signal Handlers" instead of "Signals" as headerMartin Smith2011-08-021-1/+1
| | | | | | | | Task-number: QTBUG-17072
| * qdoc: Fixed to remove extranious markup tags.Martin Smith2011-07-221-2/+3
| | | | | | | | Task-numberr: QTBUG-20474
* | Merge remote-tracking branch 'upstream/4.8' into qt-4.8-from-4.7Sergio Ahumada2011-08-311-2/+3
|\ \ | | | | | | | | | | | | Conflicts: src/network/ssl/qsslcertificate.cpp
| * \ Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration ↵Qt Continuous Integration System2011-08-271-4/+84
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into master-integration * 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration: Fixed use of deleted object in XmlPatterns EvaluationCache Crash when creating scroll bar skin graphics on S60 (debug only) QS60Style omits drawing theme background in some Symbian SDKs Fix for qml1shaderplugin GPU resource handling on Symbian Make it easier to select words at the start of a line. Doc: Fixing typo In landscape mode QComboboBox popup can not be showed completely Fix left alignment of native RTL pre-edit text.
| * | Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration ↵Qt Continuous Integration System2011-08-251-1/+4
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into master-integration * 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration: (21 commits) Revert "Avoid calling QInputMethod update when adding or removing QGraphicsItems that don't have focus" Symbian: Not possible to catch RequestSoftwareInputPanel in eventFilter Fix problem with grabWindow on Mac OS X 10.6 with Cocoa Added an additional check to workaround an issue on Windows. don't crash when destroying children Fix compile issue with Mac OS X 10.5 Avoid calling QInputMethod update when adding or removing QGraphicsItems that don't have focus Exact word bubble doesn't disappear when screen is tapped (fix part 2) Fix QPixmap::grabWindow() on Mac OS X Lion Update 4.7.4 changes Exact word bubble doesn't disappear when screen is tapped Make text rendering working outside the gui thread on Symbian. Doc: Clarified the range of return values from QLineF::angle(). Doc: Fixed \since declarations. Doc: Standardized on QtQuick for \since declarations. Doc: Removed whitespace. Modified \since command behavior slightly to handle project and version. Doc: Added a simple introduction to Qt and fixed links. Doc: Added more appropriate links to help reduce confusion. Doc: Removed non-ASCII characters from the documentation. ...
| | * | Modified \since command behavior slightly to handle project and version.David Boddie2011-06-301-83/+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.
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2011-06-091-1/+4
| | |\ \ | | | |/ | | |/|
| | | * qdoc: Fixed QTBUG-19338Martin Smith2011-05-161-1/+4
| | | |
| * | | qdoc: Fixed a crash caused by accessing a null pointer.David Boddie2011-07-221-2/+3
| | | |
| * | | Modified \since command behavior slightly to handle project and version.David Boddie2011-07-011-83/+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)
* | | Modified \since command behavior slightly to handle project and version.David Boddie2011-08-301-83/+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
* | | qdoc: Fixed QTBUG-19338Martin Smith2011-08-301-1/+4
|/ / | | | | | | | | | | (cherry picked from commit 1ea0e706981006c48ad16a1ff8051df03610f20b) 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-19226Martin Smith2011-05-121-2/+6
| |
* | doc: Fixed QTBUG-19223Martin Smith2011-05-121-1/+3
| |
* | doc: Remved debug code for QTBUG-18791Martin Smith2011-05-121-26/+0
| |
* | doc: Fixed QTBUG-18791Martin Smith2011-05-111-5/+28
|/
* qdoc: Completed task QTBUG-18790Martin Smith2011-04-151-0/+2
|
* qdoc: Completed task QTBUG-18733Martin Smith2011-04-141-15/+61
|
* qdoc: Updated the QDoc manual.Martin Smith2011-04-061-12/+12
|
* qdoc: Allowed multiple values for certain metadata tags.Martin Smith2011-04-051-29/+60
| | | | | 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-14/+21
| | | | | | | | | | | 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: 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
|
* qdoc: Completed metadata handling.Martin Smith2011-03-241-70/+128
| | | | But not the default values part in the config file.
* qdoc: Added the <othermeta> element.Martin Smith2011-03-181-1/+11
|
* qdoc: Completed changing <section> structure.Martin Smith2011-03-171-175/+152
| | | | | | 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-189/+233
| | | | | | 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 <publisher> and <permissions> elements.Martin Smith2011-03-101-9/+23
|
* 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-091-5/+26
|
* qdoc: Added Author> and <category> elements to the metadata.Martin Smith2011-03-071-25/+91
|
* qdoc: Added enum values and tag names for <prolog> and <metadata>Martin Smith2011-03-041-5/+53
| | | | These contain many subelements, whose tages were also added.
* qdoc: Removed debug code.Martin Smith2011-03-021-1/+0
|
* Merge branch 'mimir' into 4.7David Boddie2011-02-231-845/+938
|\ | | | | | | | | | | | | | | | | | | | | 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/+31
| | | | | | | | 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-17/+66
| | | | | | | | 11 instances of raw-html remain.
| * qdoc: Added the \caption command.Martin Smith2011-01-131-0/+6
| | | | | | | | | | 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-835/+830
| | | | | | | | Only 27 raw-html uses remaining.
| * qdoc: Replaced many raw-html cases with \div {something}.Martin Smith2011-01-071-2/+2
| |
| * qdoc: Changed <bodydiv> to <sectiondiv>.Martin Smith2011-01-041-14/+14
| | | | | | | | | | Removed format="html" from the <xref> because it didn't work. Investigating further.
| * qdoc: Added format="html" to every <xref> for http.Martin Smith2011-01-031-0/+12
| |
generated by cgit v0.12 at 2025-01-13 00:52:52 (GMT)