summaryrefslogtreecommitdiffstats
path: root/tools/qdoc3
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-02-10116-14369/+7665
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/development/qmake-manual.qdoc mkspecs/symbian-gcce/qmake.conf qmake/project.cpp src/corelib/global/qnamespace.qdoc src/declarative/graphicsitems/qdeclarativetext.cpp src/gui/text/qtextdocumentlayout.cpp src/gui/text/qtextdocumentlayout_p.h tests/auto/declarative/qdeclarativetext/tst_qdeclarativetext.cpp tests/auto/networkselftest/networkselftest.pro tests/auto/qscriptengine/tst_qscriptengine.cpp tools/designer/src/components/signalsloteditor/signalslot_utils.cpp tools/designer/src/components/signalsloteditor/signalsloteditorwindow.cpp tools/qdoc3/test/qt-build-docs.qdocconf tools/qdoc3/test/qt-html-templates.qdocconf tools/qdoc3/test/qt-html-templates_zh_CN.qdocconf tools/qdoc3/test/qt.qdocconf tools/qdoc3/test/qt_ja_JP.qdocconf tools/qdoc3/test/qt_zh_CN.qdocconf
| * Ensured that trailing newlines are quoted and correct atoms are used.David Boddie2011-02-052-5/+17
| | | | | | | | | | | | Newlines after comments at the end of files were previously omitted. An assumption about the type code being quoted caused incorrect CSS classes to be used and extra HTML elements to be used.
| * Fixed build breakage.David Boddie2011-02-041-1/+1
| |
| * Fixed C++ and plain markup found in \c commands.David Boddie2011-02-041-6/+25
| |
| * Added a configuration variable for the QML documentation file prefix.David Boddie2011-02-0310-175/+217
| | | | | | | | | | | | | | | | | | 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
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2011-02-021-1/+1
| |\
| | * Doc: Fixing typoSergio Ahumada2011-01-311-1/+1
| | |
| * | Fixed a bug that caused marked up inline text to be truncated.David Boddie2011-02-021-1/+1
| | |
| * | Doc: Updated the copyright statements in the templates.David Boddie2011-02-012-2/+2
| |/
| * Doc: Added a missing style sheet to the qhp manifest.David Boddie2011-01-281-1/+1
| | | | | | | | This may need to be cherry-picked into the 4.7.2 release.
| * Doc: Fixed the qthelp namespace for the Qt documentation.David Boddie2011-01-281-1/+1
| | | | | | | | This may need to be cherry-picked into the 4.7.2 release.
| * Avoid hard-coding product names in page titles.David Boddie2011-01-271-6/+4
| | | | | | | | Fall back to Qt if no product name is used.
| * Removed a configuration file that can no longer be used.David Boddie2011-01-241-12/+0
| |
| * Merge branch '4.7' into qdoc-simplifiedDavid Boddie2011-01-241-1/+4
| |\
| | * Ensured that an uninitialized output codec is never used.David Boddie2011-01-241-1/+4
| | | | | | | | | | | | | | | | | | See task for contributor information. Task-number: QTBUG-16462
| * | Merge branch '4.7' into qdoc-simplifiedDavid Boddie2011-01-2157-57/+57
| |\ \ | | |/ | | | | | | | | | | | | Conflicts: src/declarative/graphicsitems/qdeclarativeitem.cpp src/declarative/util/qdeclarativeanimation.cpp
| | * Merge branch '4.7' of ../qt into 4.7David Boddie2011-01-1357-57/+57
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | Doc: Updated the qdoc manual.David Boddie2011-01-211-12/+21
| | | |
| * | | Allowed the indentation of marked up code to be customized.David Boddie2011-01-202-8/+17
| | | | | | | | | | | | | | | | | | | | Marked up code is indented according to its indentation relative to the snippet markers (//! for example) in the quoted source code.
| * | | Enabled syntax highlighting by default.David Boddie2011-01-206-35/+20
| | | | | | | | | | | | | | | | | | | | Removed the linksinmarkup configuration option because it was not introduced in all relevant places.
| * | | Ongoing improvements and fixes to syntax highlighting.David Boddie2011-01-2012-49/+100
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | Added a \js command for JavaScript code.David Boddie2011-01-201-0/+12
| | | |
| * | | Ensured that QML elements are marked up as types.David Boddie2011-01-201-2/+1
| | | |
| * | | Define what the -slow command line option does.David Boddie2011-01-188-19/+16
| | | | | | | | | | | | | | | | | | | | Added configuration options for syntax highlighting and linking. These are also enabled if the -slow command line option is used.
| * | | Replaced the C++ code marker with the one from Qt Quarterly.David Boddie2011-01-181-248/+235
| | | | | | | | | | | | | | | | | | | | More changes still need to be made to restore features from the old marker, including markup for links to classes and functions.
| * | | Removed unnecessary markup escaping code.David Boddie2011-01-181-1/+1
| |/ / | | | | | | | | | There should be no need to escape markup at this point in the marker.
| * | Enabled error reporting and a plain text fallback for invalid QML.David Boddie2010-12-2110-25/+39
| | | | | | | | | | | | | | | The location of places where code is included in documentation is now passed into each code marker when highlighted code is needed.
| * | Doc: Updated the Qt version number.David Boddie2010-12-211-4/+4
| | |
| * | Doc: Fixed whitespace.David Boddie2010-12-213-11/+11
| | |
| * | Fixed handling of indented snippet markers.David Boddie2010-12-202-30/+27
| | | | | | | | | | | | Refactored the code to remove namespace macros and snippet markers.
| * | Removed obsolete configuration options.David Boddie2010-12-172-10/+0
| | |
| * | Updated the offline template to use a new offline style sheet.David Boddie2010-12-172-17/+10
| | |
| * | Merge branch '4.7' into qdoc-simplifiedDavid Boddie2010-12-171-1/+2
| |\ \
| | * | qdoc: Added typedef to help the OSX compiler accept a template.Martin Smith2010-12-161-1/+2
| | | |
| * | | Whitespace fixes.David Boddie2010-12-171-1/+1
| |/ /
| * | Treat div elements like paragraphs.David Boddie2010-12-141-0/+3
| | |
| * | Removed macros for figures and floats. We'll use \div...\enddiv instead.David Boddie2010-12-141-32/+0
| | |
| * | 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
| | | |
generated by cgit v0.12 at 2024-12-29 00:31:49 (GMT)