summaryrefslogtreecommitdiffstats
path: root/tools/qdoc3/cppcodemarker.cpp
Commit message (Expand)AuthorAgeFilesLines
* Merge remote branch 'origin/4.8' into 4.8-from-4.7Rohan McGovern2011-09-141-29/+11
|\
| * Added an additional check to workaround an issue on Windows.David Boddie2011-09-021-1/+1
| * Merge remote branch 'mainline/4.8'Casper van Donderen2011-08-311-26/+4
| |\
| | * Merge remote-tracking branch 'upstream/4.8'Sergio Ahumada2011-08-291-1/+1
| | |\
| | * | 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
| |\ \ \ | | |_|/ | |/| |
| | * | qdoc3: Reverting part of the change for QTBUG-17072Martin Smith2011-08-021-4/+4
| | * | qdoc3: Write "Signal Handlers" instead of "Signals" as headerMartin Smith2011-08-021-10/+10
| | * | 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
| |\ \ | | |/ | |/|
| * | Added an additional check to workaround an issue on Windows.David Boddie2011-06-011-1/+1
| * | Update licenseheader text in source files for qt4.8Jyri Tahtela2011-05-131-17/+17
| * | qdoc3: Fix compilation with -no-stlhjk2011-03-021-0/+2
* | | Migrate addMarkUp function to QChar.Casper van Donderen2011-09-081-9/+9
* | | Fix assert error on Windows with a negative char.Casper van Donderen2011-09-021-4/+4
* | | Added an additional check to workaround an issue on Windows.David Boddie2011-07-071-1/+1
| |/ |/|
* | Update licenseheader text in source filesJyri Tahtela2011-05-131-17/+17
|/
* Ensured that trailing newlines are quoted and correct atoms are used.David Boddie2011-02-051-1/+4
* 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
|\
| * Merge branch '4.7' of ../qt into 4.7David Boddie2011-01-131-1/+1
| |\
| | * Update copyright year to 2011.Jason McDonald2011-01-101-1/+1
* | | Ongoing improvements and fixes to syntax highlighting.David Boddie2011-01-201-9/+26
* | | Replaced the C++ code marker with the one from Qt Quarterly.David Boddie2011-01-181-248/+235
|/ /
* | Enabled error reporting and a plain text fallback for invalid QML.David Boddie2010-12-211-4/+5
* | Added the foundations of QML markup support.David Boddie2010-11-281-1/+0
* | 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
* qdoc: Added <div> elements to some html output for class references.Martin Smith2010-03-301-26/+50
* Doc: Added a config file for creating Simplified Chinese docs directly.David Boddie2010-02-251-1/+1
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2010-02-121-8/+6
|\
| * qdoc: Made a temporary fix for comment highlighting.David Boddie2010-02-091-8/+6
* | Merge branch 'kinetic-declarativeui' of git://git-nokia.trolltech.com.au/qtso...Warwick Allison2010-02-041-2/+2
|\ \ | |/ |/|
| * Merge branch '4.6' of git://scm.dev.nokia.troll.no/qt/qt into kinetic-declara...Warwick Allison2010-01-141-1/+1
| |\
| * | 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
| * | qdoc3: Fixed a linking problem for qml methods.Martin Smith2009-11-051-4/+4
| * | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declarati...Michael Brasser2009-10-251-4/+34
| |\ \
| * | | 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 kinetic-declarati...Michael Brasser2009-10-191-2/+17
| |\ \ \
| * | | | Improve qdoc generated QML documentation.Michael Brasser2009-10-091-6/+6
* | | | | Merge branch '4.6'Thiago Macieira2010-01-131-1/+1
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Update copyright year to 2010Jason McDonald2010-01-061-1/+1
* | | | | Merge branch '4.6'Thiago Macieira2009-11-131-4/+6
|\ \ \ \ \ | |/ / / /
| * | | | qdoc3: Output the full signature for QML signals and methodsMartin Smith2009-11-111-0/+2
| * | | | qdoc3: Fixed a linking problem for qml methods.Martin Smith2009-11-111-4/+4