summaryrefslogtreecommitdiffstats
path: root/tools/qdoc3
Commit message (Collapse)AuthorAgeFilesLines
* qdoc3: Allow the full signature for QML signals and methodsMartin Smith2009-11-104-25/+41
| | | | | | | | ...in the \qmlmethod and \qmlsignal commands, and the corresponding "attached" ones. Previously, the type was not allowed, but it really should be there, which means the \qmlmethod and \qmlsignal commands should be updated throughout.
* Merge branch '4.6' of git://scm.dev.nokia.troll.no/qt/qt into ↵Warwick Allison2009-11-092-2/+32
|\ | | | | | | | | | | | | | | | | | | | | | | kinetic-declarativeui Conflicts: configure.exe src/corelib/animation/qabstractanimation.cpp src/gui/graphicsview/qgraphicsview.cpp src/s60installs/s60installs.pro tools/configure/configureapp.cpp tools/qdoc3/node.h
| * Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6David Boddie2009-11-0410-23/+75
| |\
| | * qdoc updates for QMLWarwick Allison2009-11-0410-23/+75
| | | | | | | | | | | | Reviewed-by:Michael Brasser
| * | qdoc: Fixed XHTML breakage caused by the Google search bar markup.David Boddie2009-11-031-2/+2
| |/ | | | | | | Reviewed-by: Trust Me
* | qdoc3: Output the full signature for QML signals and methodsMartin Smith2009-11-062-2/+5
| | | | | | | | In the Method Documentation and Signal Documentation sections.
* | qdoc3: Fixed a linking problem for qml methods.Martin Smith2009-11-057-88/+152
| | | | | | | | | | | | 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 ↵Warwick Allison2009-11-041-1/+0
|\ \ | |/ | | | | | | | | | | | | kinetic-declarativeui Conflicts: configure.exe src/gui/graphicsview/qgraphicsitem_p.h
| * Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into 4.6David Boddie2009-11-032-16/+14
| |\ | | | | | | | | | | | | | | | Conflicts: src/gui/kernel/qevent.cpp src/network/ssl/qsslerror.cpp
| | * qdoc3: Fixed a linking error for qml properties.Martin Smith2009-10-292-16/+14
| | | | | | | | | | | | | | | | | | | | | This: https://qtmetrics.europe.nokia.com/kinetic-declarativeui/qml-item.html#rotation-prop should now be this: https://qtmetrics.europe.nokia.com/kinetic-declarativeui/qml-item.html#transformOrigin-prop)
| * | qdoc: Disabled reporting the NOTIFY signal until I know what it broke.Martin Smith2009-11-031-1/+0
| |/ | | | | | | Task-number: 259071
* | Accidental commit.Warwick Allison2009-11-022-1271/+0
| |
* | Merge branch 'kinetic-declarativeui' of ↵Aaron Kennedy2009-10-305-22/+47
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui Conflicts: src/declarative/debugger/qmldebug.cpp src/declarative/fx/qmlgraphicsimagebase_p.h src/declarative/util/qmlanimation.h src/declarative/util/qmlstate.h src/declarative/util/qmltimer.cpp
| * | qdoc3: display 'read-only' in QML docs for read only properties.Michael Brasser2009-10-304-6/+33
| | |
| * | qdoc3: Fixed a linking error for qml properties.Martin Smith2009-10-292-16/+14
| | | | | | | | | | | | | | | | | | | | | This: https://qtmetrics.europe.nokia.com/kinetic-declarativeui/qml-item.html#rotation-prop should now be this: https://qtmetrics.europe.nokia.com/kinetic-declarativeui/qml-item.html#transformOrigin-prop)
* | | Rename QFx classes to QmlGraphicsAaron Kennedy2009-10-301-2/+2
|/ /
* | Merge branch '4.6' of ../qt into kinetic-declarativeuiAaron Kennedy2009-10-291-150/+0
|\ \ | |/ | | | | | | | | | | | | | | | | | | Conflicts: src/script/api/qscriptengine.cpp src/script/api/qscriptprogram.cpp src/script/api/qscriptprogram.h src/script/api/qscriptprogram_p.h tests/auto/qscriptengine/tst_qscriptengine.cpp tests/auto/qscriptengineagent/tst_qscriptengineagent.cpp tools/qdoc3/test/qt-inc.qdocconf
| * Doc: Remove unused file.David Boddie2009-10-271-149/+0
| | | | | | | | Reviewed-by: Trust Me
* | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into ↵Michael Brasser2009-10-255-15/+73
|\ \ | |/ | | | | | | | | | | kinetic-declarativeui Conflicts: tools/qdoc3/cppcodemarker.cpp
| * Doc: Updated the modules for the "Desktop" (Full Framework) edition.David Boddie2009-10-231-1/+1
| | | | | | | | Reviewed-by: Trust Me
| * qdoc3: Added the \qmlattachedsignal and \qmlattachedmethod.Martin Smith2009-10-234-14/+72
| | | | | | | | They works just like the \qmlsignal and \qmlmethod commands.
* | Prepend element name for detailed attached property docs.Michael Brasser2009-10-212-2/+6
| |
* | doc now in globalobject.qdoc, not READMEWarwick Allison2009-10-202-0/+1271
| | | | | | | | QT-2335
* | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into ↵Michael Brasser2009-10-195-17/+56
|\ \ | |/ | | | | | | | | | | kinetic-declarativeui Conflicts: tools/qdoc3/cppcodemarker.cpp
| * qdoc3: Added the \qmlattachedproperty command.Martin Smith2009-10-195-17/+56
| | | | | | | | | | | | It works just like the \qmlproperty command, except that it puts the properties in a different section for attached properties.
* | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into ↵Michael Brasser2009-10-199-279/+458
|\ \ | |/ | | | | | | | | | | | | | | | | kinetic-declarativeui Conflicts: configure.exe src/corelib/animation/qabstractanimation.cpp src/s60installs/qt.iby util/qlalr/cppgenerator.cpp
| * Remove qdocconf files for the old mac-specific source package.Jason McDonald2009-10-153-35/+0
| | | | | | | | | | | | | | These files are not used for the qt-everywhere source packages, and the platform-specific source packages are no longer needed. Reviewed-by: Trust Me
| * qdoc: Made the \sincelist command produce better html.Martin Smith2009-10-142-64/+102
| |
| * Fixed compile.Rohan McGovern2009-10-081-1/+2
| |
| * qdoc: Removed some debug code and #if 0 code.Martin Smith2009-10-081-113/+1
| |
| * doc: Changed the format of the since list.Martin Smith2009-10-086-144/+431
| | | | | | | | | | This is a big change from the original, and I expect we will want modifications.
* | Improve qdoc generated QML documentation.Michael Brasser2009-10-097-10/+33
| |
* | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into ↵Michael Brasser2009-10-041-0/+1
|\ \ | |/ | | | | | | | | | | kinetic-declarativeui Conflicts: configure
| * doc: Fixed numerous qdoc errors.Martin Smith2009-10-021-0/+1
| |
* | Merge commit 'qt-mainline/4.6' into kinetic-declarativeuiAndreas Aardal Hanssen2009-10-0217-101/+209
|\ \ | |/ | | | | | | Conflicts: configure.exe
| * Touch up and fixes for the documentation frontpageJens Bache-Wiig2009-10-011-5/+9
| | | | | | | | | | | | | | | | | | | | | | - I reverted the font enlargement. This should be up to the user. - The fonts are now uniform again, giving a more professional apparance. - Added a slight gradient for the headers to give it a more modern look. - Fixed a rendering glitch with webkit where no borders were visible. The qt-resources.qdoc is basically there to export the image. Reviewed-by: Morten Engvoldsen
| * Doc: Removed the old Console edition and updated edition naming.David Boddie2009-10-014-16/+4
| | | | | | | | Reviewed-by: Trust Me
| * Exclude the MMF Phonon plugin folder for qdoc.Frans Englich2009-10-011-0/+1
| | | | | | | | As done for the other plugins. Brought to attention by Volker.
| * qdoc: Added a missing "/" in a "<h2>".Martin Smith2009-10-011-38/+45
| |
| * doc: Fixed ending of header in the HTML generated for \sincelistThorbjørn Lindeijer2009-10-011-2/+1
| |
| * qdoc: Modified the support for \sincelist.Martin Smith2009-09-304-29/+137
| | | | | | | | It now finds a lot more \since 4.6 stuff.
| * Improve error reporting when qdoc cannot open a source file.Jason McDonald2009-09-291-1/+2
| | | | | | | | | | | | | | Make the user's life easier by including the reason for the error in the failure message. Reviewed-by: Trust Me
| * Assistant, Designer, Lingist and QMake manuals weren't generated.Jason McDonald2009-09-296-12/+12
| | | | | | | | | | | | | | | | | | qdoc3 warns when it doesn't find doc source files that are listed in the .qdocconf file, but it doesn't error out. Thus the manuals haven't been generated since the 4.6 doc reorganization, but the failure has been silent. Reviewed-by: Trust Me
* | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into ↵Michael Brasser2009-09-2911-18/+98
|\ \ | |/ | | | | | | | | | | | | kinetic-declarativeui Conflicts: configure.exe mkspecs/features/qt.prf
| * Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Jason McDonald2009-09-251-0/+5
| |\
| | * qdoc: test only for major and minor version when generating "since" lists.Volker Hilsheimer2009-09-241-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | This solution might need a bit of more thinking, the "\sincelist" command might need a parameter so that we can have the "new since 4.6" list also in Qt 4.7 documentation. Rev-by: TrustMe
| * | Stop qdoc outputting meaningless paths in html comments.Jason McDonald2009-09-251-1/+1
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | qdoc was generating the full path to the source document in a comment at the top of each generated html file. For source packages the path is a temporary directory that only exists during package generation. The path also usually contains the Unix username of the user who generated the package, and we shouldn't leak usernames for security and privacy reasons. This commit changes the code to write just the filename of the source document into the comment instead of the full path. Reviewed-by: Lincoln Ramsay
| * Generate mac refs in docs.Jason McDonald2009-09-222-0/+4
| | | | | | | | | | | | | | Now that we don't make platform-specific source packages, we only have one version of the docs. These docs need to include all platforms. Reviewed-by: Trust Me
| * Remove distinction between different editions in docs.Jason McDonald2009-09-221-6/+3
| | | | | | | | | | | | | | We now generate only one set of docs, for the qt-everywhere package. Thus we no longer need to differentiate the different editions. Reviewed-by: Trust Me
| * Make compileBill King2009-09-221-1/+1
| |