summaryrefslogtreecommitdiffstats
path: root/tools/qdoc3/htmlgenerator.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Modified \since command behavior slightly to handle project and version.David Boddie2011-08-301-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
* 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.
* | | | Define what the -slow command line option does.David Boddie2011-01-181-4/+4
|/ / / | | | | | | | | | | | | Added configuration options for syntax highlighting and linking. These are also enabled if the -slow command line option is used.
* | | Removed obsolete configuration options.David Boddie2010-12-171-6/+0
| |/ |/|
* | Merge branch 'qdoc-simplified' into mimir-simplifiedDavid Boddie2010-12-141-1/+1
|\ \ | | | | | | | | | | | | | | | Conflicts: tools/qdoc3/atom.h tools/qdoc3/qdoc3.pro
| * | Used a different style class for areas containing QML markup.David Boddie2010-12-091-1/+1
| | |
* | | qdoc: Changed index.qdoc to use new \div commandMartin Smith2010-12-141-1/+11
| | | | | | | | | | | | | | | | | | | | | | | | 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-472/+78
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-2/+8
| | |
| * | Merge branch '4.7' into qdoc-simplifiedDavid Boddie2010-11-301-1/+1
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: tools/qdoc3/htmlgenerator.cpp tools/qdoc3/htmlgenerator.h tools/qdoc3/test/qt-build-docs.qdocconf tools/qdoc3/test/qt.qdocconf tools/qdoc3/test/qt_ja_JP.qdocconf tools/qdoc3/test/qt_zh_CN.qdocconf
| | * qdoc: Fixed virtualness and constness of the fileBase() function.Martin Smith2010-11-111-3/+6
| | | | | | | | | | | | Task-number: QTBUG-13939
| * | Added more span classes to make the QML output more colorful.David Boddie2010-11-291-13/+30
| | |
| * | Added the foundations of QML markup support.David Boddie2010-11-281-18/+8
| | | | | | | | | | | | | | | | | | 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.
| * | Ensured that the inObsoleteLink variable is initialized.David Boddie2010-11-251-1/+2
| | |
| * | Added the version number to the configuration and fixed the generator.David Boddie2010-11-241-3/+1
| | | | | | | | | | | | Now the version number should appear in the documentation again.
| * | Removed unused code.David Boddie2010-11-241-112/+0
| | |
| * | Removed unused code.David Boddie2010-11-221-86/+0
| | |
| * | Removed unused files and functionality from qdoc3.David Boddie2010-11-191-130/+2
| | | | | | | | | | | | | | | | | | | | | | | | Many of the generators were unused. The old QSA and Qt Script parsers were unused. We no longer use DCF files for Qt Assistant. We no longer generate Qt Jambi documentation, and qdoc3 was not used for much of that process, making some of the relevant files obsolete.
| * | Started fixing qdoc's output to use some kind of page templates.David Boddie2010-11-111-106/+24
| |/ | | | | | | | | | | | | Removed hard-coded style and script information. Split .qdocconf files to help separate content and presentation. Task-number: QTBUG-15208
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2010-11-051-2/+2
| |\
| | * Doc: adding html clasnames to the next and previous linksMorten Engvoldsen2010-11-041-2/+2
| | | | | | | | | | | | Reviewed-by: David Boddie
| * | qdoc: Remove leading QML: text from certain node names.David Boddie2010-11-041-1/+5
| |/ | | | | | | Reviewed-by: Martin Smith
| * qdoc: Added next and previous links to top of pages.Martin Smith2010-11-031-3/+1
| | | | | | | | Task-number: QTBUG-14979
| * Doc: fixing unclosed <p>Morten Engvoldsen2010-10-151-1/+1
| |
generated by cgit v0.12 at 2024-11-15 10:25:01 (GMT)