summaryrefslogtreecommitdiffstats
path: root/tools/qdoc3/htmlgenerator.cpp
Commit message (Collapse)AuthorAgeFilesLines
* 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
| |
* | doc: Corrections to linking errors in the docs.Martin Smith2010-11-011-0/+1
| |
* | qdoc: Don't put classes that have empty doc in hierarchy.Martin Smith2010-10-291-1/+1
| |
* | qdoc: Changed GUIDs from "{xxxxxx}" to "id-xxxxxxx".Martin Smith2010-10-181-0/+1
| |
* | Merge commit 'origin/4.7' into mimirMorten Engvoldsen2010-10-061-65/+63
|\ \ | |/
| * Doc: Removed a superfluous comment.David Boddie2010-10-041-1/+0
| | | | | | | | | | Related to the rejected, but valid merge request: http://qt.gitorious.org/qt/qt/merge_requests/809
| * Doc: Fixed non-well-formed table output.David Boddie2010-09-241-1/+1
| | | | | | | | Reviewed-by: Trust Me
| * Doc: Fixed coding style breakage in qdoc source code.David Boddie2010-09-231-65/+64
| | | | | | | | Reviewed-by: Trust Me
* | qdoc: Replaced missing "const" That caused link errors.Martin Smith2010-09-211-2/+2
|/ | | | | A const had been erroneously dropped from some fileBase() functions.
* Doc: Removing google analytics from offline docsMorten Engvoldsen2010-09-161-4/+4
|
* qdoc: Fixed an html formatting error in the QML property list.Martin Smith2010-09-151-21/+1
|
* qdoc: Fixed erroneous links to QML basic types.Martin Smith2010-08-251-2/+9
| | | | Task-nr: QTBUG-13096
* Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Morten Engvoldsen2010-08-201-5/+4
|\
| * qdoc: Changed id attribute to be a UUID.Martin Smith2010-08-201-5/+4
| | | | | | | | Task-nr: QTBUG-11113
* | Doc: fixing creator bugs, removing menus and textbox in the headerMorten Engvoldsen2010-08-201-6/+7
|/
* qdoc: Added more elements to qt.pageindexMartin Smith2010-08-191-0/+29
| | | | Task-nr: QTBUG-11113
* qdoc3: Added more pagewords & elements to the search index.Martin Smith2010-08-191-3/+3
| | | | Task-nr: QTBUG-11113
* qdoc3: Added more pagewords & elements to the search index.Martin Smith2010-08-191-0/+6
| | | | Task-nr: QTBUG-11113
* qdoc: Reorganized the QML elements table to be a dictionary...Martin Smith2010-08-181-33/+74
| | | | ...and a set of functional group pages.
* qdoc: Reorganized the QML elements table to be a dictionary...Martin Smith2010-08-161-0/+10
| | | | ...and a set of functional group pages.
* qdoc: All references to -assistant and -base were removed.Martin Smith2010-08-121-17/+1
| | | | | Flags allowed are now -creator and -online. -creator is the default.
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7David Boddie2010-08-111-4/+98
|\
generated by cgit v0.12 at 2025-01-09 08:44:44 (GMT)