summaryrefslogtreecommitdiffstats
path: root/tools/qdoc3
Commit message (Collapse)AuthorAgeFilesLines
* Doc: Update copyright information in documentation templatesTopi Reinio2015-01-1412-30/+30
| | | | | | | | - Update copyright year to 2015 - Update copyright holder to The Qt Company Ltd Change-Id: I2ed489f82639c93344051de38491183987a743e1 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
* Bump Qt version to 4.8.7Akseli Salovaara2014-12-039-29/+29
| | | | | Change-Id: Icd6fcdb59eb1b9fd8de555ef1c1c87a379f06a27 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Updated year in copyright headerKai Koehne2014-03-2692-94/+94
| | | | | | | | | | | | | | | | | | find . -path '*/3rdparty/*' -prune -o -type f -print | xargs -L1 sed -i -E 's/Copyright(.*) 2013 Digia/Copyright\1 2014 Digia/g' Manually patched files: demos/spectrum/3rdparty/fftreal/fftreal_wrapper.h demos/spectrum/3rdparty/fftreal/fftreal_wrapper.cpp src/3rdparty/s60/eiksoftkeyimage.h tools/qdoc3/test/qt-project.qdocconf tests/auto/qsharedpointer/nontracked.h tests/auto/qsharedpointer/nontracked.cpp Change-Id: I3f9074923b4d6bd4666258ab04f01476cc6e901c Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Sergio Ahumada <sahumada@blackberry.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Bump Qt version to 4.8.6Thiago Macieira2013-07-099-29/+29
| | | | | Change-Id: I91189c8c33591ef866a4478c113f93162afede95 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* Doc: Updated HTML copyright year to 2013.Jerome Pasion2013-01-2212-12/+12
| | | | | | Change-Id: I62fa2443cc7cfd187458eb99d370472d553600f8 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com> Reviewed-by: Johanna Äijälä <johanna.aijala@digia.com>
* Update copyright year in Digia's license headersSergio Ahumada2013-01-1381-83/+83
| | | | | | Change-Id: I52bf8ef0447b701b4ebf7d7d240013a72adb9425 Reviewed-by: Akseli Salovaara <akseli.salovaara@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* Bump Qt version to 4.8.5Sergio Ahumada2012-12-079-29/+29
| | | | | Change-Id: I7e991d4b1f7f3b5a51170e6ff09e293c4285ea26 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Doc: Updated links on the documentation's headers.Jerome Pasion2012-11-025-23/+16
| | | | | | Change-Id: I4e13d27288ef50e7b9d04a12abbc299cb91a7501 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
* More copyright changes to Digia Plc in translations and toolsjutaipal2012-10-144-78/+78
| | | | | | | | Change-Id: Idb88b4e72548dfa641c6b8ce78a661fa61757ad0 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com> Reviewed-by: Simo Fält <simo.falt@digia.com> Reviewed-by: Akseli Salovaara <akseli.salovaara@digia.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Changed Qt release version to 4.8.4jutaipal2012-10-089-29/+29
| | | | | | | Change-Id: I45f7894f7e79617b6ccb8caa464bbbffaf9dd7b5 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com> Reviewed-by: Akseli Salovaara <akseli.salovaara@digia.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Fix g++/MinGW compiler warnings.Friedemann Kleint2012-09-295-10/+2
| | | | | | | | | | - Assigned/Unused variables. - Unsigned comparison >= 0 is always true. - Constructor initialization order. - Signed/Unsigned comparisons. Change-Id: I1f9edab0506573420ed0bf3055252ba48625c8eb Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* Change copyrights from Nokia to DigiaIikka Eklund2012-09-2992-1974/+1974
| | | | | | | | Change copyrights and license headers from Nokia to Digia Change-Id: I280c0a575987d1770e354b4948f1d4d767d711ea Reviewed-by: Simo Fält <simo.falt@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* Changed qt version to 4.8.3jutaipal2012-08-089-29/+29
| | | | | | | | | Change-Id: Ib26f4c1d3b236f947d685ef5c376c203bda0e650 Reviewed-by: Lars Knoll <lars.knoll@nokia.com> Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com> Reviewed-by: Akseli Salovaara <akseli.salovaara@digia.com> Reviewed-by: Simo Fält <simo.falt@nokia.com> Reviewed-by: Juha Kukkonen <ext-juha.kukkonen@nokia.com>
* Update contact information in license headers.Sergio Ahumada2012-08-0181-167/+167
| | | | | | | | | | | | | - Replace Nokia contact email address with Qt Project website. - Remove "All rights reserved" line from license headers. As in the past, to avoid rewriting various autotests that contain line-number information, an extra blank line has been inserted at the end of the license text to ensure that this commit does not change the total number of lines in the license header. Change-Id: Ie7ba62011752fcb149b99b26317c54f2a0cfa931 Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
* Remove build_all when target is same for debug and releaseSamuli Piippo2012-04-301-3/+1
| | | | | | | | | | | Change build rules for projects where both debug and release target are the same file. For these, it makes no sense building both targets, as they overwrite each other. Now build only release target, when build_all is used. Change-Id: Iffd1076028b1cc91e8151c346bf4761772dafe65 Reviewed-by: Simo Fält <simo.falt@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* qdoc: Disambiguate prev and next links in html sourceDaniel Molkentin2012-04-261-2/+2
| | | | | Change-Id: I46d9bc685c00bb1fc1d79f75eaf8e1f56e57d744 Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
* Add icons for previous and next page.Daniel Molkentin2012-04-262-0/+4
| | | | | Change-Id: I3b16c70b4742a942ceec2035c46618ebc63b697f Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
* docs: fix conflicting resource file namesDaniel Molkentin2012-04-261-1/+1
| | | | | Change-Id: I10bd6abe214507f663cc7c6a0b3a6f3c69668360 Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
* QDoc: Remove the text around previous and next page links.Casper van Donderen2012-04-261-4/+4
| | | | | | | | | Previously we printed "[Previous: <link>] and [Next: <link>]. After this change we only print the <link>, which should include an icon. Change-Id: I7bf46623b3bce6b02067127338a1235861449e64 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com> Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
* Bump Qt version to 4.8.2aksalova2012-04-189-30/+30
| | | | | | | | Change-Id: Iecae324b1ae00c0d6fb6ed36a8f4a27f51a31d07 Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com> Reviewed-by: Simo Fält <simo.falt@nokia.com> Reviewed-by: Juha Kukkonen <ext-juha.kukkonen@nokia.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Update the links in the titlebar of Online HTML template.Casper van Donderen2012-03-173-6/+6
| | | | | | | | The links were still pointing to old URLs, this change changes the links to point to qt-project.org Change-Id: Ie0b7b5aef693c54174e5400d6a16bdbfb540c763 Reviewed-by: Jerome Pasion <jerome.pasion@nokia.com>
* Fix generating the qdoc3 manual in 4.8Casper van Donderen2012-03-142-3/+4
| | | | | | | | There were some qdoc errors when generating the qdoc manual. This change fixes thoise qdoc errors. Change-Id: I9e12abbc6688f0fefc3534d830d581a80f5b973a Reviewed-by: Jerome Pasion <jerome.pasion@nokia.com>
* Update the footer for qdoc output for qt-project.Casper van Donderen2012-03-148-116/+114
| | | | | Change-Id: I6518c03715cd485330a6550bd62d385477a45c7a Reviewed-by: Jerome Pasion <jerome.pasion@nokia.com>
* Bump Qt version to 4.8.1Girish Ramakrishnan2012-03-059-30/+30
| | | | | | | | Change-Id: I117e5dcd45397a9fbd1f033fc745ada00c221721 Reviewed-by: Donald Carr <donald.carr@nokia.com> Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com> Reviewed-by: Simo Fält <simo.falt@nokia.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Remove unnecessary codeblock.Casper van Donderen2012-02-071-9/+0
| | | | | | | Fixes: QTBUG-24082 Change-Id: I000e397983d3f26b49ffc9cc61f0d4e20583e6ee Reviewed-by: Martin Smith <martin.smith@nokia.com>
* Update year in Nokia copyright messages.Jason McDonald2012-01-1111-11/+11
| | | | | | | | Manually update strings that did not get fixed by previous search-and-replace. Change-Id: Ie9ff57f08ce0dcf91d28620fa2dc9eeb8e98481e Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Update year in Nokia copyright messages.Jason McDonald2012-01-1181-83/+83
| | | | | | | | | Simple search and replace. This commit doesn't touch 3rd-party files, nor translations (where the change is not so simple and will be handled in a separate commit). Change-Id: I4e48513b8078a44a8cd272326685b25338890148 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Also correctly apply stack size difference in MSVC2008Casper van Donderen2011-12-301-2/+2
| | | | | The quotes around the stack size are not parsed correctly in MSVC2008, MSVC2010 accepts both the version with and without quotes.
* Add a default alt attribute to img tags.Casper van Donderen2011-12-301-0/+2
| | | | | | | The output HTML did not pass validation without a default alt attribute. Reviewed-by: Kevin Wright
* Revert variable overwritten by copying from Qt5Casper van Donderen2011-12-221-1/+1
| | | | Reviewed-by: Trust me
* New style sheet for offline (QCH) documentationCasper van Donderen2011-12-222-1/+19
| | | | | This stylesheet makes the Qt Reference docs look the same as the Qt Creator docs.
* Fix a bug where 'int' is not printed in snippets.Casper van Donderen2011-12-191-1/+2
| | | | Reviewed-By: Trust Me
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging into ↵Qt Continuous Integration System2011-11-2913-0/+0
|\ | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging: Set execution bits for more scripts. Set execution bits for .test files. Fix more permissions (no execute bit). Fix permission (no execute bit). QGraphicsLayoutItem - bound constraint the minimum and maximum size Notify X11 of its resizable state through MWM Hints.
| * Fix permission (no execute bit).Frederik Gladhorn2011-11-2213-0/+0
| |
* | Fix qdoc output for <dependency> tag.Daniel Molkentin2011-11-221-6/+3
| | | | | | | | | | | | Also prepend relative path if required. Reviewed-By: trustme
* | Merge remote-tracking branch 'qt-doc-review/master'Casper van Donderen2011-11-223-0/+22
|\ \
| * | qdoc3: qdoc supports \depends in 4.8Martin Smith2011-11-211-3/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is what you write... /*! \example designer/calculatorbuilder \depends qmlapplicationviewer \title Calculator Builder Example This is what you get... <example name="Calculator Builder Example" docUrl="qthelp://com.trolltech.qt.480/qdoc/designer-calculatorbuilder.html" projectPath="designer/calculatorbuilder/calculatorbuilder.pro" imageUrl="qthelp://com.trolltech.qt.480/qdoc/images/calculatorbuilder-example.png"> <description><![CDATA[The Calculator Builder example shows how to create a user interface from a Qt Designer form at run-time, using the QUiLoader class.]]></description> <tags>calculator,builder</tags> <fileToOpen>designer/calculatorbuilder/main.cpp</fileToOpen> <dependency>$QTDIR/examples/qmlapplicationviewer</dependency> </example> Task-number: QTBUG-22838
| * | qdoc3: qdoc supports \depends in 4.8Martin Smith2011-11-213-0/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is what you write... /*! \example designer/calculatorbuilder \depends examples/qmlapplicationviewer \title Calculator Builder Example This is what you get... <example name="Calculator Builder Example" docUrl="qthelp://com.trolltech.qt.480/qdoc/designer-calculatorbuilder.html" projectPath="designer/calculatorbuilder/calculatorbuilder.pro" imageUrl="qthelp://com.trolltech.qt.480/qdoc/images/calculatorbuilder-example.png"> <description><![CDATA[The Calculator Builder example shows how to create a user interface from a Qt Designer form at run-time, using the QUiLoader class.]]></description> <tags>calculator,builder</tags> <fileToOpen>designer/calculatorbuilder/main.cpp</fileToOpen> <depends>../../examples/qmlapplicationviewer</depends> </example> Task-number: QTBUG-22838
* | | Compile fix.Daniel Molkentin2011-11-211-2/+1
| | | | | | | | | | | | Reviewed-by: trustme
* | | Doc: Create relative pathes in Manifest files.Daniel Molkentin2011-11-211-0/+21
| |/ |/| | | | | | | | | Conditions: shadow build & non-prefix build Reviewed-by: Casper van Donderen
* | Increase qdoc3 stack size when using MSVC to 4M.Casper van Donderen2011-11-141-0/+5
|/ | | | | | | | | | | When running 'make docs' on Win7 with MSVC2010 64bit debug qdoc will crash from a stack overflow. The stack overflow occurs when sorting the list of nodes in the internal qdoc tree. This patch circumvents the stack overflow crash by increasing the stack size from the standard 1M to 4M. Reviewed-by: Friedemann Kleint
* qdoc3: Replace %REPLACEME% with the correct pathMartin Smith2011-10-312-2/+7
| | | | Task-number: QTBUG-22427
* Fix security issue on website due to bad JS.Casper van Donderen2011-10-214-47/+1
| | | | Reviewed-by: Trust Me
* Merge remote branch 'origin/4.8' into 4.8-from-4.7Rohan McGovern2011-09-1460-444/+728
|\ | | | | | | | | | | Conflicts: src/gui/text/qtextengine_p.h src/network/ssl/qsslsocket_openssl.cpp
| * Merge remote-tracking branch 'origin/4.8' into qt-4.8-from-4.7Liang Qi2011-09-032-38/+0
| |\ | | | | | | | | | | | | Conflicts: tools/qdoc3/htmlgenerator.cpp
| | * Modified \since command behavior slightly to handle project and version.David Boddie2011-09-029-202/+168
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (The since argument can contain a project name and version, defaulting to the qdoc project if only a version number is specified.) Refactored common code into the Generator class. Fixed \sincelist HTML generation for tables containing only one item. (cherry picked from commit 6a2f18140bbc41207eb2f5e2323b699600d89606) Reapplied after bad v4.7.4 merge
| | * Added an additional check to workaround an issue on Windows.David Boddie2011-09-021-1/+1
| | | | | | | | | | | | | | | | | | Reviewed-by: David Boddie Original-patch-by: Friedemann Kleint (cherry picked from commit 8b1654ec6a892e84c1654c9196e80461ee6e92fa)
| * | Merge branch 4.8 into qt-4.8-from-4.7Sergio Ahumada2011-09-0110-38/+327
| |\ \ | | |/ | | | | | | | | | | | | Conflicts: tools/qdoc3/ditaxmlgenerator.cpp tools/qdoc3/htmlgenerator.cpp
| | * Merge remote branch 'mainline/4.8'Casper van Donderen2011-08-312-59/+8
| | |\ | | | | | | | | | | | | | | | | | | | | Conflicts: tools/qdoc3/cppcodemarker.cpp tools/qdoc3/node.cpp
| | * \ Merge remote branch 'qt-doc-review/master'Casper van Donderen2011-08-3111-172/+169
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/declarative/righttoleft.qdoc tools/qdoc3/generator.h
generated by cgit v0.12 at 2024-11-24 19:24:17 (GMT)