summaryrefslogtreecommitdiffstats
path: root/tools/qdoc3/cppcodemarker.cpp
Commit message (Expand)AuthorAgeFilesLines
* 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
* | 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
* | | | | Merge branch '4.6'Thiago Macieira2009-11-101-10/+14
|\ \ \ \ \ | |/ / / /
| * | | | qdoc updates for QMLWarwick Allison2009-11-041-10/+14
| | |_|/ | |/| |
* | | | Merge remote branch 'origin/4.6'Thiago Macieira2009-10-261-4/+34
|\ \ \ \ | |/ / /
| * | | qdoc3: Added the \qmlattachedsignal and \qmlattachedmethod.Martin Smith2009-10-231-4/+34
| | |/ | |/|
* | | Merge branch '4.6'Thiago Macieira2009-10-211-2/+17
|\ \ \ | |/ /
| * | qdoc3: Added the \qmlattachedproperty command.Martin Smith2009-10-191-2/+17
| |/
* | qdoc: Fix misinterpretation of // in strings as a single-line-comment.Warwick Allison2009-10-161-1/+3
|/
* Update license headers again.Jason McDonald2009-09-091-4/+4
* Merge branch '4.5' into 4.6Thiago Macieira2009-08-311-13/+13
|\
| * Update tech preview license header.Jason McDonald2009-08-311-13/+13
| * Update license headers.Jason McDonald2009-08-111-1/+1
* | Update contact URL in license headers.Jason McDonald2009-08-121-1/+1
* | Merge QML specific qdoc changesAaron Kennedy2009-07-291-10/+131
* | qdoc: Changed handling of reimplemented functions.Martin Smith2009-06-261-16/+61
|/
* Update license headers as requested by the marketing department.Jason McDonald2009-06-161-2/+2
* Long live Qt 4.5!Lars Knoll2009-03-231-0/+1009