summaryrefslogtreecommitdiffstats
path: root/tools/qdoc3
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'qdoc-simplified' into mimir-simplifiedDavid Boddie2010-12-1412-66/+105
|\ | | | | | | | | | | Conflicts: tools/qdoc3/atom.h tools/qdoc3/qdoc3.pro
| * Added macros for floating images and floating images with alt text.David Boddie2010-12-131-0/+32
| | | | | | | | | | | | | | | | Ideally, these would be HTML-only macros, but the macro system doesn't know whether macro arguments used in pure HTML are file names, so the necessary files are not included. By using qdoc commands, we ensure the files are copied into the generated documentation's images directory.
| * Fixed macro argument handling.David Boddie2010-12-131-5/+42
| | | | | | | | | | | | | | | | | | Fixed macro definition parsing that confused someone into thinking that single backslashes would appear in macro definitions instead of control codes. Fixed a bug that caused only arguments in general macros to be handled. Enabled arguments in HTML macros.
| * Removed trailing whitespace.David Boddie2010-12-131-25/+25
| |
| * Ensured that object definition identifiers are marked up as links.David Boddie2010-12-092-4/+13
| | | | | | | | It may be worthwhile extending this to other UiQualifiedId nodes.
| * Added hack to remove markup for opened comments at the end of snippets.David Boddie2010-12-091-0/+4
| |
| * Removed redundant style information and images.David Boddie2010-12-094-53/+10
| |
| * Used a different style class for areas containing QML markup.David Boddie2010-12-091-1/+1
| |
| * Use the same style of qmake variable referencing used elsewhere in Qt.David Boddie2010-12-081-2/+2
| |
* | qdoc: Changed index.qdoc to use new \div commandMartin Smith2010-12-147-6/+44
| | | | | | | | | | | | | | | | 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.
* | doc: Fixed the \raisedaster macro to write the <sup> element.Martin Smith2010-12-091-0/+5
| | | | | | | | | | | | But only for the special case of "*". Still, it got rid of a lot of raw-html cases. More to come here.
* | doc: Removed the \hr macro from the DITA XML qdocconf file.Martin Smith2010-12-091-1/+1
| | | | | | | | This eliminates some "raw-html" cases.
* | qdoc: Updated signature of generateInnerNode() in the XML generator.Martin Smith2010-12-093-8/+13
| |
* | Merge branch 'mimir' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into mimirMartin Smith2010-12-08113-11222/+4281
|\ \
| * | Updated the DITA configuration to use the new configuration structure.David Boddie2010-12-071-1/+1
| | |
| * | Updated the DITA generator to use the modified generator API.David Boddie2010-12-071-1/+1
| | |
| * | Merge branch 'qdoc-simplified' into mimir-simplifiedDavid Boddie2010-12-07112-11220/+4279
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 missing qmlcodemarker.cpp and qmlcodemarker.h files.David Boddie2010-12-067-25/+523
| | | | | | | | | | | | | | | | | | | | | | | | Added code to remove pragmas before parsing and add them to the output. The extractPragmas() function was copied into both qmlcodeparser.cpp and qmlcodemarker.cpp from src/declarative/qml/qdeclarativescriptparser.cpp, and was modified to return either nothing (for the API parser) or a list of removed pragmas (for the code marker).
| | * Forced the \qml command to use the QML code marker.David Boddie2010-12-061-2/+3
| | |
| | * Removed QDebug includes.David Boddie2010-12-063-4/+0
| | |
| | * Minor housekeeping changes.David Boddie2010-12-031-1/+1
| | |
| | * Added a specialized version of the QML code marker for JavaScript files.David Boddie2010-12-024-0/+207
| | |
| | * Updated handling of some statement nodes, removed unnecessary functions.David Boddie2010-12-012-669/+28
| | |
| | * Fixed/adjusted handling of UiPublicMember nodes.David Boddie2010-12-012-199/+5
| | | | | | | | | | | | Removed debugging code.
| | * Trivial comment fix.David Boddie2010-12-011-1/+1
| | |
| | * Select the appropriate code marker for each file.David Boddie2010-12-012-3/+9
| | |
| | * Removed an unused function.David Boddie2010-12-011-15/+0
| | |
| | * Merge branch '4.7' into qdoc-simplifiedDavid Boddie2010-11-3013-36/+38
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | | * Merge remote branch 'qt/4.7' into 4.7Jason McDonald2010-11-185-14/+27
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: tools/qdoc3/test/qt-build-docs.qdocconf tools/qdoc3/test/qt.qdocconf
| | | | * qdoc: Added QML Elements to the Assistant indexMartin Smith2010-11-113-10/+20
| | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-15081
| | | | * Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Martin Smith2010-11-112-3/+3
| | | | |\
| | | | * | qdoc: Fixed virtualness and constness of the fileBase() function.Martin Smith2010-11-112-4/+7
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-13939
| | | * | | Bump Qt version to 4.7.2.Jason McDonald2010-11-1212-40/+40
| | | | |/ | | | |/| | | | | | | | | | | Reviewed-by: Trust Me
| | | * | Doc: Fixing typoSergio Ahumada2010-11-091-1/+1
| | | | |
| | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-11-082-3/+3
| | | |\ \ | | | | |/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fixed text rendering bug in raster engine when opacity != 1.0. Prevented race condition on texture destruction. More fix for QTBUG-14640:oci performance problem with qlonglong Doc: Fixing typo Fixed grabWidget sometimes returning uninitialized memory. Fix Malayalam Rendering - 'Ra' is PreBase Update .def files for QtGui and QtOpenVG Use 32bit textures for alpha textures after all. One more fix for dithering. Doc: Fixing typo Fix QTBUG-14640:oci performance problem with qlonglong 32bit => 16bit conversion has 4byte-aligned output. Fix gcc bug in qReallocAligned Prevented threading related crash in OpenGL module. Fix possible crash in QStaticText and QDeclarativeTextLayout Fix QTBUG-14132 oracle (xe) stored procedures with bind variables get errors
| | | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-11-052-3/+3
| | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: More fix for QTBUG-14640:oci performance problem with qlonglong Doc: Fixing typo Fixed grabWidget sometimes returning uninitialized memory. Fix Malayalam Rendering - 'Ra' is PreBase Update .def files for QtGui and QtOpenVG Use 32bit textures for alpha textures after all. One more fix for dithering. Doc: Fixing typo Fix QTBUG-14640:oci performance problem with qlonglong 32bit => 16bit conversion has 4byte-aligned output. Fix gcc bug in qReallocAligned Prevented threading related crash in OpenGL module. Fix possible crash in QStaticText and QDeclarativeTextLayout Fix QTBUG-14132 oracle (xe) stored procedures with bind variables get errors
| | | | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-11-032-3/+3
| | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Doc: Fixing typo Fixed grabWidget sometimes returning uninitialized memory. Fix Malayalam Rendering - 'Ra' is PreBase Update .def files for QtGui and QtOpenVG Use 32bit textures for alpha textures after all. One more fix for dithering. Doc: Fixing typo Fix QTBUG-14640:oci performance problem with qlonglong 32bit => 16bit conversion has 4byte-aligned output. Fix gcc bug in qReallocAligned Prevented threading related crash in OpenGL module. Fix possible crash in QStaticText and QDeclarativeTextLayout Fix QTBUG-14132 oracle (xe) stored procedures with bind variables get errors
| | | | | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-11-032-3/+3
| | | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fix Malayalam Rendering - 'Ra' is PreBase Update .def files for QtGui and QtOpenVG Use 32bit textures for alpha textures after all. One more fix for dithering. Doc: Fixing typo Fix QTBUG-14640:oci performance problem with qlonglong 32bit => 16bit conversion has 4byte-aligned output. Fix gcc bug in qReallocAligned Prevented threading related crash in OpenGL module. Fix possible crash in QStaticText and QDeclarativeTextLayout Fix QTBUG-14132 oracle (xe) stored procedures with bind variables get errors
| | | | | | | * Doc: Fixing typoSergio Ahumada2010-11-012-3/+3
| | | | | | | |
| | * | | | | | Made more adjustments to node handling and removed debugging statements.David Boddie2010-11-301-11/+11
| | | | | | | |
| | * | | | | | Made further refinements to the node traversal and comment handling.David Boddie2010-11-292-109/+186
| | | | | | | |
| | * | | | | | Fixed grammar.David Boddie2010-11-292-2/+2
| | | | | | | |
| | * | | | | | Added more span classes to make the QML output more colorful.David Boddie2010-11-291-13/+30
| | | | | | | |
| | * | | | | | Removed unnecessary include, fixed whitespace.David Boddie2010-11-291-469/+468
| | | | | | | |
| | * | | | | | Added the foundations of QML markup support.David Boddie2010-11-2818-126/+1877
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| | * | | | | | Added support for pure QML signals and properties.David Boddie2010-11-252-14/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Generalized the function to annotate nodes with documentation.
| | * | | | | | Ensured that QML nodes are imported from indexes.David Boddie2010-11-251-0/+6
| | | | | | | |
| | * | | | | | Added a check for read-only pure QML properties before C++ checks.David Boddie2010-11-251-0/+3
| | | | | | | |
| | * | | | | | Trivial whitespace fixes.David Boddie2010-11-251-3/+3
| | | | | | | |
| | * | | | | | Ensured that the inObsoleteLink variable is initialized.David Boddie2010-11-251-1/+2
| | | | | | | |
generated by cgit v0.12 at 2024-12-26 07:25:43 (GMT)