summaryrefslogtreecommitdiffstats
path: root/tools/qdoc3/jscodemarker.cpp
Commit message (Collapse)AuthorAgeFilesLines
* 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>
* Update licenseheader text in source files for qt4.8Jyri Tahtela2011-05-131-17/+17
| | | | | | | Updated version of LGPL and FDL licenseheaders. Apply release phase licenseheaders for all source files. Reviewed-by: Trust Me
* Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-04-071-5/+5
|\ | | | | | | | | | | Conflicts: src/gui/text/qfontengine_mac.mm tests/auto/qdiriterator/tst_qdiriterator.cpp
| * Fixed the declarative headers and includes within qdoc.David Boddie2011-04-051-5/+5
| |
* | Update copyright year to 2011.Rohan McGovern2011-03-101-1/+1
|/ | | | | Reviewed-by: Trust Me (cherry picked from commit 774a3536b00c4d6e4c4c10b708e31b4373a338e3)
* Ongoing improvements and fixes to syntax highlighting.David Boddie2011-01-201-0/+8
| | | | | | | | | | 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.
* Enabled error reporting and a plain text fallback for invalid QML.David Boddie2010-12-211-3/+9
| | | | | The location of places where code is included in documentation is now passed into each code marker when highlighted code is needed.
* Added missing qmlcodemarker.cpp and qmlcodemarker.h files.David Boddie2010-12-061-3/+11
| | | | | | | | 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).
* Minor housekeeping changes.David Boddie2010-12-031-1/+1
|
* Added a specialized version of the QML code marker for JavaScript files.David Boddie2010-12-021-0/+129