summaryrefslogtreecommitdiffstats
path: root/tools/qdoc3
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.6'Thiago Macieira2009-11-1012-42/+91
|\ | | | | | | | | | | | | | | | | Conflicts: src/gui/styles/qcommonstyle.cpp tools/assistant/lib/lib.pro tools/assistant/lib/qhelp_global.cpp tools/assistant/tools/assistant/assistant.qch tools/assistant/tools/assistant/mainwindow.cpp
| * 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
| * 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
* | Merge branch '4.6'Thiago Macieira2009-10-291-149/+0
|\ \ | |/ | | | | | | Conflicts: tools/qdoc3/test/qt-inc.qdocconf
| * Doc: Remove unused file.David Boddie2009-10-271-149/+0
| | | | | | | | Reviewed-by: Trust Me
* | Merge remote branch 'origin/4.6'Thiago Macieira2009-10-265-15/+73
|\ \ | |/ | | | | | | Conflicts: tools/qdoc3/test/qt-build-docs.qdocconf
| * 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.
* | Merge branch '4.6'Thiago Macieira2009-10-215-17/+56
|\ \ | |/
| * 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'Thiago Macieira2009-10-165-99/+102
|\ \ | |/ | | | | | | | | Conflicts: translations/assistant_adp_pl.ts translations/assistant_adp_ru.ts
| * 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
| |
* | qdoc: Fix misinterpretation of // in strings as a single-line-comment.Warwick Allison2009-10-161-1/+3
| | | | | | | | Mainly fixes quoted URLs, but a few other cases too.
* | Merge branch '4.6'Thiago Macieira2009-10-086-218/+394
|\ \ | |/ | | | | | | Conflicts: tools/assistant/translations/translations_adp.pro
| * 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.
* | Merge branch '4.6'Thiago Macieira2009-10-057-61/+61
|\ \ | |/ | | | | | | | | | | | | | | | | Conflicts: src/corelib/io/qdatastream.h tools/assistant/translations/translations_adp.pro tools/qdoc3/test/qt-build-docs.qdocconf tools/qdoc3/test/qt-inc.qdocconf tools/qdoc3/test/qt.qdocconf translations/assistant_adp_de.ts
| * doc: Fixed numerous qdoc errors.Martin Smith2009-10-021-0/+1
| |
| * 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
| |
* | Merge branch '4.6'Thiago Macieira2009-09-304-29/+137
|\ \ | |/ | | | | | | Conflicts: src/corelib/io/qdatastream.h
| * qdoc: Modified the support for \sincelist.Martin Smith2009-09-304-29/+137
| | | | | | | | It now finds a lot more \since 4.6 stuff.
* | Merge branch '4.6'Thiago Macieira2009-09-2918-31/+112
|\ \ | |/ | | | | | | Conflicts: doc/src/qt4-intro.qdoc
| * 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 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
| |
| * Doc: Exclude the Q_CORE_EXPORT_INLINE declaration from the docs.David Boddie2009-09-211-0/+1
| | | | | | | | Reviewed-by: Trust Me
| * qdoc: Reverting 4.6 to %VERSION%.Martin Smith2009-09-211-1/+1
| |
| * qdoc: Added \brief texts to all the since 4.6 functions.Martin Smith2009-09-212-4/+9
| |
| * qdoc: Added "since" 4.6 lists to the "What's New" page.Martin Smith2009-09-216-8/+71
| | | | | | | | In test/qt.qdocconf, change %VERSION% to 4.6, for example.
| * Doc: Added missing qdoc macros.David Boddie2009-09-181-0/+5
| | | | | | | | Reviewed-by: Trust Me
* | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-09-182-4/+4
|\ \ | |/ | | | | | | | | Conflicts: src/3rdparty/webkit/WebKit/qt/Api/qwebframe.cpp src/gui/kernel/qwidget_x11.cpp
| * Merge branch '4.5' into 4.6Tom Cooksey2009-09-172-4/+4
| |\ | | | | | | | | | | | | | | | | | | Conflicts: tests/auto/qimagereader/tst_qimagereader.cpp tests/auto/qpainter/tst_qpainter.cpp tests/auto/qtwidgets/tst_qtwidgets.cpp
| | * Update qt eclipse integration version number in docs, fix paths.Jarek Kobus2009-09-172-4/+4
| | |
| | * Update license headers again.Jason McDonald2009-09-0889-356/+356
| | | | | | | | | | | | Reviewed-by: Trust Me
* | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-09-171-0/+2
|\ \ \ | |/ /
generated by cgit v0.12 at 2025-01-09 08:52:22 (GMT)