summaryrefslogtreecommitdiffstats
path: root/tools/qdoc3/htmlgenerator.cpp
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>
* Fix g++/MinGW compiler warnings.Friedemann Kleint2012-09-291-2/+0
| | | | | | | | | | - Assigned/Unused variables. - Unsigned comparison >= 0 is always true. - Constructor initialization order. - Signed/Unsigned comparisons. Change-Id: I1f9edab0506573420ed0bf3055252ba48625c8eb Reviewed-by: Kai Koehne <kai.koehne@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>
* qdoc: Disambiguate prev and next links in html sourceDaniel Molkentin2012-04-261-2/+2
| | | | | Change-Id: I46d9bc685c00bb1fc1d79f75eaf8e1f56e57d744 Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
* QDoc: Remove the text around previous and next page links.Casper van Donderen2012-04-261-4/+4
| | | | | | | | | Previously we printed "[Previous: <link>] and [Next: <link>]. After this change we only print the <link>, which should include an icon. Change-Id: I7bf46623b3bce6b02067127338a1235861449e64 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com> Reviewed-by: Casper van Donderen <casper.vandonderen@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>
* Add a default alt attribute to img tags.Casper van Donderen2011-12-301-0/+2
| | | | | | | The output HTML did not pass validation without a default alt attribute. Reviewed-by: Kevin Wright
* Fix qdoc output for <dependency> tag.Daniel Molkentin2011-11-221-6/+3
| | | | | | Also prepend relative path if required. Reviewed-By: trustme
* Merge remote-tracking branch 'qt-doc-review/master'Casper van Donderen2011-11-221-0/+13
|\
| * qdoc3: qdoc supports \depends in 4.8Martin Smith2011-11-211-3/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is what you write... /*! \example designer/calculatorbuilder \depends qmlapplicationviewer \title Calculator Builder Example This is what you get... <example name="Calculator Builder Example" docUrl="qthelp://com.trolltech.qt.480/qdoc/designer-calculatorbuilder.html" projectPath="designer/calculatorbuilder/calculatorbuilder.pro" imageUrl="qthelp://com.trolltech.qt.480/qdoc/images/calculatorbuilder-example.png"> <description><![CDATA[The Calculator Builder example shows how to create a user interface from a Qt Designer form at run-time, using the QUiLoader class.]]></description> <tags>calculator,builder</tags> <fileToOpen>designer/calculatorbuilder/main.cpp</fileToOpen> <dependency>$QTDIR/examples/qmlapplicationviewer</dependency> </example> Task-number: QTBUG-22838
| * qdoc3: qdoc supports \depends in 4.8Martin Smith2011-11-211-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is what you write... /*! \example designer/calculatorbuilder \depends examples/qmlapplicationviewer \title Calculator Builder Example This is what you get... <example name="Calculator Builder Example" docUrl="qthelp://com.trolltech.qt.480/qdoc/designer-calculatorbuilder.html" projectPath="designer/calculatorbuilder/calculatorbuilder.pro" imageUrl="qthelp://com.trolltech.qt.480/qdoc/images/calculatorbuilder-example.png"> <description><![CDATA[The Calculator Builder example shows how to create a user interface from a Qt Designer form at run-time, using the QUiLoader class.]]></description> <tags>calculator,builder</tags> <fileToOpen>designer/calculatorbuilder/main.cpp</fileToOpen> <depends>../../examples/qmlapplicationviewer</depends> </example> Task-number: QTBUG-22838
* | Compile fix.Daniel Molkentin2011-11-211-2/+1
| | | | | | | | Reviewed-by: trustme
* | Doc: Create relative pathes in Manifest files.Daniel Molkentin2011-11-211-0/+21
|/ | | | | | Conditions: shadow build & non-prefix build Reviewed-by: Casper van Donderen
* qdoc3: Replace %REPLACEME% with the correct pathMartin Smith2011-10-311-2/+6
| | | | Task-number: QTBUG-22427
* Modified \since command behavior slightly to handle project and version.David Boddie2011-09-021-88/+15
| | | | | | | | | | (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
* qdoc3: Updates for QTBUG-20776; include fileToOpen path.Martin Smith2011-08-181-2/+6
| | | | Task-number: QTBUG-20776
* qdoc3: Updates for QTBUG-20776; clear map between runs.Martin Smith2011-08-181-1/+21
| | | | Task-number: QTBUG-20776
* qdoc3: Updates for QTBUG-20739 (no read-only for QML components)Martin Smith2011-08-111-1/+2
| | | | Task-number: QTBUG-20739
* qdoc3: Updates for QTBUG-20776 and QTBUG-20777Martin Smith2011-08-101-14/+81
| | | | Task-number: QTBUG-20776, QTBUG-20777
* qdoc3: Write "Signal Handlers" instead of "Signals" as headerMartin Smith2011-08-021-1/+1
| | | | Task-number: QTBUG-17072
* qdoc: Added HTML.nobreadcrumbs as a config variable.Martin Smith2011-07-211-1/+6
| | | | Task-numberr: QTBUG-20475
* Phase 1 of QTBUG-20412, the XML manifest fileMartin Smith2011-07-151-10/+86
|
* 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/+2
|/
* qdoc: Completed task QTBUG-18733Martin Smith2011-04-141-99/+2
|
* qdoc: Fixed QTBUG-18591Martin Smith2011-04-061-0/+2
|
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2011-04-051-0/+1
|\
| * qdoc: Allowed multiple values for certain metadata tags.Martin Smith2011-04-051-0/+1
| | | | | | | | | | Also output mainters for classes in the HTML output, if there are maintainers listed.
* | 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
|
* Fixed invalid HTML output.David Boddie2011-03-031-1/+1
|
* qdoc: Began adding descriptions for QML commands.Martin Smith2011-02-251-3/+3
|
* Merge branch 'mimir' into 4.7David Boddie2011-02-231-39/+78
|\ | | | | | | | | | | | | | | | | | | | | 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: Updated the qdoc manual and its config file.Martin Smith2011-02-161-10/+10
| |
| * qdoc: Updated the qdoc manual.Martin Smith2011-02-011-0/+4
| |
| * qdoc: Added the \span command.Martin Smith2011-01-241-7/+14
| | | | | | | | 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-15/+5
| | | | | | | | 11 instances of raw-html remain.
| * qdoc: Added colorizing of individual table cells.Martin Smith2011-01-141-14/+24
| |
| * qdoc: Added a parameter to \rowMartin Smith2011-01-131-7/+18
| | | | | | | | And removed some \raw cases. Only 11 raw-html uses remaining.
| * qdoc: Added the \caption command.Martin Smith2011-01-131-2/+15
| | | | | | | | | | 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-071-6/+10
| |
* | Added a configuration variable for the QML documentation file prefix.David Boddie2011-02-031-1/+146
| | | | | | | | | | | | | | | | | | 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
* | Avoid hard-coding product names in page titles.David Boddie2011-01-271-6/+4
| | | | | | | | Fall back to Qt if no product name is 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
* | | | Enabled syntax highlighting by default.David Boddie2011-01-201-24/+18
| | | | | | | | | | | | | | | | | | | | Removed the linksinmarkup configuration option because it was not introduced in all relevant places.
* | | | Ongoing improvements and fixes to syntax highlighting.David Boddie2011-01-201-6/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
generated by cgit v0.12 at 2025-09-07 01:52:57 (GMT)