summaryrefslogtreecommitdiffstats
path: root/tools/qdoc3
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into ↵Michael Brasser2009-08-13102-157/+207
|\ | | | | | | | | | | | | | | | | | | | | kinetic-declarativeui Conflicts: configure configure.exe mkspecs/features/qt.prf src/corelib/global/qglobal.h src/corelib/kernel/qobject_p.h
| * qdoc: Changed the scripts for the google search boxMartin Smith2009-08-121-1/+6
| | | | | | | | Task-number: 258950
| * qdoc: Added google CSE to each page.Martin Smith2009-08-121-11/+18
| | | | | | | | Task-number: 258950
| * Replace "Trolltech" with more appropriate terms.Jason McDonald2009-08-121-1/+1
| | | | | | | | Reviewed-by: Trust Me
| * Surrounded a string const with QString() to get snippet to work.Martin Smith2009-08-121-0/+1
| | | | | | | | Task-number: 258967
| * Update references to online documentation.Jason McDonald2009-08-121-1/+1
| | | | | | | | Reviewed-by: Trust Me
| * Update URL's to use new domain.Jason McDonald2009-08-1212-14/+14
| | | | | | | | Reviewed-by: Trust Me
| * Update contact URL in license headers.Jason McDonald2009-08-1289-89/+89
| | | | | | | | Reviewed-by: Trust Me
| * qdoc: List the NOTIFY signal function in the property doc.Martin Smith2009-08-105-3/+18
| |
| * qdoc: Don't include internal or private classes in annotated lists.Martin Smith2009-08-061-1/+2
| |
| * qdoc: Fixed a Windows crash in HtmlGenerator::generateCompactList().Martin Smith2009-08-061-26/+17
| |
| * Workaround a crash in qdoc.Volker Hilsheimer2009-08-051-0/+5
| | | | | | | | Caused by an odd number of classes it seems.
| * Make \annotatedlist <group> work also in pages that are not \group pages.Volker Hilsheimer2009-08-051-9/+6
| | | | | | | | | | | | The command right now only lists the classes in the group, in alphabetical order. Not ideal for integrating into overviews, where the list should be ordered by relevance.
| * qdoc: Removed the "No such group" qdoc error.Martin Smith2009-08-051-0/+2
| | | | | | | | | | | | | | | | This error was printed if you used a \ingroup xxx, but there was no \group xxx anywhere. Now we will stop using the \group command, but we will retain the \ingroup command for use with the \annotatedlist command.
| * qdoc: Added \annotated list command to qdoc3.Martin Smith2009-08-046-14/+40
| | | | | | | | | | | | | | Now you can put "\annotatedlist xxx" anywhere in a qdoc comment, and it will generate the class list for the xxx group at that location. xxx must be a group name.
* | Merge branch 'master' of ../qt into kinetic-declarativeuiAaron Kennedy2009-07-304-5/+18
|\ \ | |/ | | | | | | Conflicts: src/gui/widgets/qlinecontrol_p.h
| * Merge branch 'master' of git://git-nokia.trolltech.com.au/qtsoftware/qt/qtAaron Kennedy2009-07-304-5/+18
| |\
| | * qdoc: Added -obsoletelinks flag to opt in for reporting obsolete links.Martin Smith2009-07-294-5/+18
| | |
| * | Merge QML specific qdoc changesAaron Kennedy2009-07-2919-312/+1413
| |/ | | | | | | Reviewed-by: Martin Smith
* | Merge branch 'master' of ../qt into kinetic-declarativeuiAaron Kennedy2009-07-292-4/+25
|\ \ | |/ | | | | | | | | | | | | | | | | Conflicts: configure.exe src/gui/graphicsview/qgraphicsitem.cpp src/gui/graphicsview/qgraphicsitem.h src/gui/graphicsview/qgraphicsitem_p.h src/gui/graphicsview/qgraphicsscene.cpp src/gui/widgets/qlineedit.cpp
| * qdoc: Added superscript obsolete to obsolete links.Martin Smith2009-07-282-2/+12
| | | | | | | | Only for obsolete links from non-obsolete things.
| * qdoc: Fixed all references to obsolete QHttp classes.Martin Smith2009-07-241-3/+11
| |
| * qdoc: Removed obsolete classes from annotated lists.Martin Smith2009-07-231-0/+3
| |
* | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into ↵Aaron Kennedy2009-07-2313-45/+95
|\ \ | |/ | | | | | | | | | | | | | | kinetic-declarativeui Conflicts: configure configure.exe src/gui/kernel/qaction.h
| * qdoc: Reported links to obsolete things that appear in non-obsolete things.Martin Smith2009-07-221-2/+7
| | | | | | | | Also marked the other QHttpXxx classes as \obsolete.
| * qdoc: Added page for obsolete classes.Martin Smith2009-07-222-21/+59
| | | | | | | | | | | | | | The classes marked \obsolete are no longer included in the "All Classes" list. They are listed separately on an "Obsolete Classes" list. The new page is reachable from the "All Classes" page and from the "Grouped Classes" page.
| * qdoc: Changed to build qdoc3 in release mode.Martin Smith2009-07-221-2/+3
| |
| * doc: Print warning where \reimp is used where \internal should be used.Martin Smith2009-07-201-9/+13
| | | | | | | | e.g. '\reimp' in myFunc() should be '\internal' because its base function is private or internal
| * doc: Increased memitemleft width from 160px to 180px.Martin Smith2009-07-202-2/+3
| |
| * Doc: Added XML Schema license information to the documentation.David Boddie2009-07-171-2/+3
| | | | | | | | | | Reviewed-by: Trust Me Post-review-sanity-check-by: Peter Hartmann
| * Doc: Updated the version numbers in the documentation metadata.David Boddie2009-07-177-13/+13
| | | | | | | | Reviewed-by: Trust Me
* | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into ↵Michael Brasser2009-07-108-64/+155
|\ \ | |/ | | | | | | | | | | | | | | | | | | kinetic-declarativeui Conflicts: configure.exe src/corelib/kernel/qmetaobject.cpp tools/qdoc3/generator.cpp tools/qdoc3/test/qt-cpp-ignore.qdocconf tools/qdoc3/test/qt-inc.qdocconf
| * qdoc: Removed unnecessary error report/ruleMartin Smith2009-07-091-0/+3
| | | | | | | | | | | | | | | | qdoc reported an error if you used \section2 on its owin, i.e. with no outer \section1. While strictly speaking correct, it imposed an unnecessary restriction, e.g. sometimes you just want to use \section2 to get a smaller title for a section.
| * doc: Output a clearer "All functions in this class are..." statement.Martin Smith2009-07-084-53/+156
| | | | | | | | Task-number: 189232
| * qdoc: Added missing CR to help message.Martin Smith2009-07-061-1/+1
| |
| * doc: Corrected several qdoc warnings.Martin Smith2009-07-022-2/+4
| |
* | Fix bad mergeMichael Brasser2009-07-022-5/+0
| |
* | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into ↵Michael Brasser2009-07-0213-86/+255
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | kinetic-declarativeui Conflicts: configure.exe src/gui/kernel/qevent.cpp src/gui/kernel/qevent_p.h tools/qdoc3/codemarker.cpp tools/qdoc3/cppcodemarker.cpp tools/qdoc3/generator.cpp
| * Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtVolker Hilsheimer2009-07-011-1/+1
| |\
| | * doc: Fixed several qdoc error reports.Martin Smith2009-07-011-1/+1
| | | | | | | | | | | | | | | Also changed qdoc not to warn about undocumented parameters if the function is marked with the \reimp command.
| * | Make "make docs" in QTDIR work on Windows, independent of configure ↵Volker Hilsheimer2009-07-011-0/+1
| |/ | | | | | | | | | | | | | | | | -debug/release/debug_and_release - build qdoc3 always into tools\qdoc3 rathern than release/debug subdirs - call it from there Reviewed-by: Marius SO
| * qdoc: Added more handling of \reimp commandMartin Smith2009-06-307-23/+47
| | | | | | | | | | | | Also fixed a few qdoc error reports. Task-number: 162182, 222650
| * qdoc: Changed handling of reimplemented functions.Martin Smith2009-06-268-43/+245
| | | | | | | | | | | | | | | | | | | | There are now sections for "Reimplemented Public Functions" and "Reimplemented Protected Functions" in the summaries for each class. This isn't complete yet. It introduces a lot of qdoc warnings about undocumented parameters, but I will fix those. There is more to be done here but i want to get some feedback already. Task-number: 162182, 222650
* | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into ↵Michael Brasser2009-06-241-0/+2
|\ \ | |/ | | | | | | | | | | | | kinetic-declarativeui Conflicts: mkspecs/features/qt.prf src/corelib/global/qglobal.h
| * Integrate the OpenVG graphics system into Qt 4.6Rhys Weatherley2009-06-221-0/+2
| | | | | | | | | | This change also moves the EGL support classes from QtOpenGL to QtGui so they can be shared between OpenGL and OpenVG.
* | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into ↵Michael Brasser2009-06-222-2/+0
|\ \ | |/ | | | | kinetic-declarativeui
| * qdoc: Fixed XHTML breakage again.David Boddie2009-06-221-2/+2
| | | | | | | | Reviewed-by: Trust me
| * Merge branch '4.5' of scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-06-192-2/+0
| |\
| | * Docs: remove reference to nonexistent fileJoerg Bornemann2009-06-192-2/+0
| | | | | | | | | | | | Reviewed-by: David Boddie
* | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into ↵Aaron Kennedy2009-06-1990-201/+202
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | kinetic-declarativeui Conflicts: configure.exe tools/qdoc3/htmlgenerator.cpp