summaryrefslogtreecommitdiffstats
path: root/tools/qdoc3/cppcodemarker.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Change copyrights from Nokia to DigiaIikka Eklund2012-09-291-24/+24
| | | | | | | | Change copyrights and license headers from Nokia to Digia Change-Id: I280c0a575987d1770e354b4948f1d4d767d711ea Reviewed-by: Simo Fält <simo.falt@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* Update contact information in license headers.Sergio Ahumada2012-08-011-2/+2
| | | | | | | | | | | | | - Replace Nokia contact email address with Qt Project website. - Remove "All rights reserved" line from license headers. As in the past, to avoid rewriting various autotests that contain line-number information, an extra blank line has been inserted at the end of the license text to ensure that this commit does not change the total number of lines in the license header. Change-Id: Ie7ba62011752fcb149b99b26317c54f2a0cfa931 Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
* 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>
* Merge remote branch 'origin/4.8' into 4.8-from-4.7Rohan McGovern2011-09-141-29/+11
|\ | | | | | | | | | | Conflicts: src/gui/text/qtextengine_p.h src/network/ssl/qsslsocket_openssl.cpp
| * Added an additional check to workaround an issue on Windows.David Boddie2011-09-021-1/+1
| | | | | | | | | | | | Reviewed-by: David Boddie Original-patch-by: Friedemann Kleint (cherry picked from commit 8b1654ec6a892e84c1654c9196e80461ee6e92fa)
| * Merge remote branch 'mainline/4.8'Casper van Donderen2011-08-311-26/+4
| |\ | | | | | | | | | | | | | | | Conflicts: tools/qdoc3/cppcodemarker.cpp tools/qdoc3/node.cpp
| | * Merge remote-tracking branch 'upstream/4.8'Sergio Ahumada2011-08-291-1/+1
| | |\ | | | | | | | | | | | | | | | | Conflicts: tools/qdoc3/cppcodemarker.cpp
| | * | fix warningKonstantin Ritt2011-08-221-1/+1
| | | |
| | * | remove unused functionsOswald Buddenhagen2011-08-221-20/+0
| | | |
| * | | Merge branch '4.8'Casper van Donderen2011-08-301-13/+15
| |\ \ \ | | |_|/ | |/| | | | | | | | | | Conflicts: doc/src/declarative/righttoleft.qdoc
| | * | qdoc3: Reverting part of the change for QTBUG-17072Martin Smith2011-08-021-4/+4
| | | | | | | | | | | | | | | | Task-number: QTBUG-17072
| | * | qdoc3: Write "Signal Handlers" instead of "Signals" as headerMartin Smith2011-08-021-10/+10
| | | | | | | | | | | | | | | | Task-number: QTBUG-17072
| | * | Phase 1 of QTBUG-20412, the XML manifest fileMartin Smith2011-07-151-0/+2
| | |/
| * | Merge branch 4.7 into qt-4.8-from-4.7Sergio Ahumada2011-08-261-1/+1
| |\ \ | | |/ | |/| | | | | | | | | | Conflicts: doc/src/index.qdoc src/xmlpatterns/expr/qevaluationcache_p.h
| * | Added an additional check to workaround an issue on Windows.David Boddie2011-06-011-1/+1
| | | | | | | | | | | | | | | Reviewed-by: David Boddie Original-patch-by: Friedemann Kleint
| * | 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
| * | qdoc3: Fix compilation with -no-stlhjk2011-03-021-0/+2
| | | | | | | | | | | | Reviewed-by: David Boddie
* | | Migrate addMarkUp function to QChar.Casper van Donderen2011-09-081-9/+9
| | | | | | | | | | | | Reviewed-by: Martin Smith
* | | Fix assert error on Windows with a negative char.Casper van Donderen2011-09-021-4/+4
| | | | | | | | | | | | | | | Reviewed-by: Denis Dzyubenko Fixes: QTBUG-20228
* | | Added an additional check to workaround an issue on Windows.David Boddie2011-07-071-1/+1
| |/ |/| | | | | | | | | Reviewed-by: David Boddie Original-patch-by: Friedemann Kleint (cherry picked from commit 8b1654ec6a892e84c1654c9196e80461ee6e92fa)
* | 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
* Ensured that trailing newlines are quoted and correct atoms are used.David Boddie2011-02-051-1/+4
| | | | | | 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
|
* Fixed a bug that caused marked up inline text to be truncated.David Boddie2011-02-021-1/+1
|
* 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
* | | Ongoing improvements and fixes to syntax highlighting.David Boddie2011-01-201-9/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | 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.
* | Enabled error reporting and a plain text fallback for invalid QML.David Boddie2010-12-211-4/+5
| | | | | | | | | | The location of places where code is included in documentation is now passed into each code marker when highlighted code is needed.
* | Added the foundations of QML markup support.David Boddie2010-11-281-1/+0
| | | | | | | | | | | | 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.
* | Removed unused code.David Boddie2010-11-221-15/+0
|/
* qdoc: Added list of all members (including inherited) page to QML elements.Martin Smith2010-08-111-1/+44
|
* qdoc: Fixed the case where the property and type names are the same.Martin Smith2010-07-071-6/+9
| | | | | | Also simplified some code. Task-number: QTBUG-6340
* qdoc: Added <div> elements to some html output for class references.Martin Smith2010-03-301-26/+50
| | | | Task: QTBUG-9504
* Doc: Added a config file for creating Simplified Chinese docs directly.David Boddie2010-02-251-1/+1
| | | | Reviewed-by: Trust Me
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-02-121-8/+6
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (27 commits) Fix QRegion under Mac OS X. update according to Thiago's comments. Changes: add functionality for dbus auto start to qt Add license header to this file readdir64 is not available on HP-UX Fix bug in QDirPrivate::setPath, affecting QDir::cd, cdUp and setPath qdoc3: Completed handling of the new \pagekeywords command. Wrong cursor shown by the parent window after setOverrideCursor(). Fixed Mac OS X compile time error by using GLint for temp. qdoc3: Added curly braces in switch statement for braindead compiler. qdoc: Added a build rule for the documentation - disabled by default. Doc: Added the qdoc manual to the repository for future maintenance. qdoc3: Fixed bug in creation of qt.pageindex. qdoc3: Added capability to create qt.pageindex. Incorrect property setter generated by dumpcpp for Microsoft Word 2007. Cocoa: Implement our own NSApplication subclass Cocoa: Menu in menubar stays highlighted qdoc: Made a temporary fix for comment highlighting. Doc: Tidied up the class layout and removed an unnecessary image. Doc/qdoc: Use Chinese titles; canonicalize titles with non-ASCII chars. ...
| * qdoc: Made a temporary fix for comment highlighting.David Boddie2010-02-091-8/+6
| | | | | | | | Reviewed-by: Trust Me
* | Merge branch 'kinetic-declarativeui' of ↵Warwick Allison2010-02-041-2/+2
|\ \ | |/ |/| | | | | | | | | | | git://git-nokia.trolltech.com.au/qtsoftware/qt/kinetic Conflicts: src/xmlpatterns/type/qprimitives_p.h tools/linguist/lupdate/main.cpp
| * Merge branch '4.6' of git://scm.dev.nokia.troll.no/qt/qt into ↵Warwick Allison2010-01-141-1/+1
| |\ | | | | | | | | | | | | | | | | | | | | | kinetic-declarativeui Conflicts: bin/syncqt src/corelib/io/qurl.cpp
| * | Don't display "QML" for attached signals/methods.Michael Brasser2009-11-111-2/+2
| | |
| * | qdoc3: Output the full signature for QML signals and methodsMartin Smith2009-11-061-0/+2
| | | | | | | | | | | | In the Method Documentation and Signal Documentation sections.
| * | qdoc3: Fixed a linking problem for qml methods.Martin Smith2009-11-051-4/+4
| | | | | | | | | | | | | | | | | | Note the Invalid Syntax errors for some uses of \qmlmethod and \qmlsignal. A syntactically correct signature is now required as the argument.
| * | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into ↵Michael Brasser2009-10-251-4/+34
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | kinetic-declarativeui Conflicts: tools/qdoc3/cppcodemarker.cpp
| * | | Prepend element name for detailed attached property docs.Michael Brasser2009-10-211-0/+4
| | | |
| * | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into ↵Michael Brasser2009-10-191-2/+17
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | kinetic-declarativeui Conflicts: tools/qdoc3/cppcodemarker.cpp
| * | | | Improve qdoc generated QML documentation.Michael Brasser2009-10-091-6/+6
| | | | |
* | | | | Merge branch '4.6'Thiago Macieira2010-01-131-1/+1
|\ \ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: bin/syncqt doc/src/deployment/deployment.qdoc src/corelib/io/qfsfileengine_win.cpp src/corelib/xml/qxmlstream.cpp src/opengl/gl2paintengineex/qpaintengineex_opengl2_p.h tools/assistant/tools/assistant/centralwidget.cpp tools/linguist/lupdate/main.cpp
| * | | | Update copyright year to 2010Jason McDonald2010-01-061-1/+1
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me
generated by cgit v0.12 at 2024-12-28 16:12:48 (GMT)