summaryrefslogtreecommitdiffstats
path: root/tools/qdoc3
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 4.7 into qt-4.8-from-4.7Sergio Ahumada2011-08-2610-186/+208
|\
* \ Merge branch 4.7 into qt-4.8-from-4.7Sergio Ahumada2011-08-233-6/+13
|\ \
| * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...v4.7.4Qt Continuous Integration System2011-08-231-1/+2
| |\ \ | | |/
| | * don't crash when destroying childrenKonstantin Ritt2011-08-221-1/+2
| * | Added an additional check to workaround an issue on Windows.David Boddie2011-08-221-1/+1
| * | Modified \since command behavior slightly to handle project and version.David Boddie2011-06-309-202/+174
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2011-06-092-5/+11
| |\ \ | | |/ | |/|
| | * Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Martin Smith2011-05-161-1/+1
| | |\
| | * | qdoc: Fixed QTBUG-19338Martin Smith2011-05-162-5/+11
* | | | Modified \since command behavior slightly to handle project and version.David Boddie2011-07-019-202/+174
* | | | qdoc: Fixed code to match comments in QML files. Fixed API types.David Boddie2011-06-082-7/+6
* | | | Added an additional check to workaround an issue on Windows.David Boddie2011-06-011-1/+1
* | | | Merge branch '4.8' of scm.dev.nokia.troll.no:qt/qt into 4.8David Boddie2011-05-2482-1540/+1569
|\ \ \ \
| * \ \ \ Merge remote branch 'origin/4.7' into 4.8-from-4.7Rohan McGovern2011-05-1782-1540/+1569
| |\ \ \ \ | | |/ / /
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-05-1781-1385/+1385
| | |\ \ \ | | | |_|/ | | |/| |
| | | * | Update licenseheader text in source filesJyri Tahtela2011-05-1381-1385/+1385
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2011-05-139-155/+184
| | |\ \ \ | | | |/ / | | |/| / | | | |/
| | | * doc: Fixed QTBUG-19226Martin Smith2011-05-121-2/+6
| | | * doc: Fixed QTBUG-19223Martin Smith2011-05-121-1/+3
| | | * doc: Remved debug code for QTBUG-18791Martin Smith2011-05-121-26/+0
| | | * doc: Fixed QTBUG-18791Martin Smith2011-05-119-145/+193
| | | * doc: Fixed a QML snippet referenceMartin Smith2011-05-091-0/+1
* | | | Doc: Updated version numbers and fixed minor whitespace issues.David Boddie2011-05-116-14/+15
* | | | Merge commit 'refs/merge-requests/1220' of git://gitorious.org/qt/qt into mer...David Boddie2011-05-058-126/+138
|\ \ \ \ | |/ / /
| * | | Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7Olivier Goffart2011-05-039-199/+297
| |\ \ \ | | |/ /
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-review into 4.7David Boddie2011-05-029-199/+297
| | |\ \ | | | |/
| | | * qdoc: Completed task QTBUG-18790Martin Smith2011-04-151-0/+2
| | | * qdoc: Completed task QTBUG-18733Martin Smith2011-04-145-125/+74
| | | * qdoc: Last commit before merge into master.Martin Smith2011-04-132-1/+27
| | | * qdoc: Fixed license comment.Martin Smith2011-04-081-21/+7
| | | * qdoc: Added missing copyright noticeMartin Smith2011-04-071-0/+41
| | | * qdoc: Updated the QDoc manual.Martin Smith2011-04-071-5/+6
| | | * qdoc: Updated the QDoc manual.Martin Smith2011-04-071-10/+13
| | | * qdoc: Updated the QDoc manual.Martin Smith2011-04-071-38/+127
| | | * qdoc: Updated the QDoc manual.Martin Smith2011-04-063-24/+23
| | | * qdoc: Fixed QTBUG-18591Martin Smith2011-04-061-0/+2
* | | | Squashed commit of the changes from the mobile-examples repositoryDavid Boddie2011-05-046-328/+416
|/ / /
* | | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2011-04-091-1/+1
|\ \ \ | |/ /
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-04-081-1/+1
| |\ \ | | |/ | |/|
| | * fix conditional on shell typeOswald Buddenhagen2011-04-081-1/+1
* | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-04-0751-312/+13785
|\ \ \ | |/ /
| * | Fixed the declarative headers and includes within qdoc.David Boddie2011-04-0522-56/+56
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2011-04-0512-102/+346
| |\ \
| | * | qdoc: Allowed multiple values for certain metadata tags.Martin Smith2011-04-059-44/+152
| | * | qdoc: modified \include to take a 2nd arg, snippet id.Martin Smith2011-04-014-33/+123
| | |/
| | * qdoc: Updates to the qdoc manual.Martin Smith2011-03-301-25/+71
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2011-03-297-69/+116
| |\ \ | | |/
| | * qdoc: Updates to the qdoc manual.Martin Smith2011-03-281-53/+38
| | * qdoc: Added a way to exclude directories from receiving default metadataMartin Smith2011-03-281-0/+20
| | * Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Martin Smith2011-03-2520-35/+12902
| | |\