summaryrefslogtreecommitdiffstats
path: root/tools/qdoc3/node.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Update copyright headersAkseli Salovaara2015-03-311-13/+13
| | | | | | | | | Qt copyrights are now in The Qt Company, so we could update the source code headers accordingly. In the same go we should also fix the links to point to qt.io. Change-Id: I7e3e96183e073877b46bc8071b2ccae19e69426b Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
* Updated year in copyright headerKai Koehne2014-03-261-1/+1
| | | | | | | | | | | | | | | | | | 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>
* Update copyright year in Digia's license headersSergio Ahumada2013-01-131-1/+1
| | | | | | Change-Id: I52bf8ef0447b701b4ebf7d7d240013a72adb9425 Reviewed-by: Akseli Salovaara <akseli.salovaara@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* Change copyrights from Nokia to DigiaIikka Eklund2012-09-291-24/+24
| | | | | | | | 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>
* Update contact information in license headers.Sergio Ahumada2012-08-011-2/+2
| | | | | | | | | | | | | - 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>
* Update year in Nokia copyright messages.Jason McDonald2012-01-111-1/+1
| | | | | | | | | 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>
* Modified \since command behavior slightly to handle project and version.David Boddie2011-09-021-0/+10
| | | | | | | | | | (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
* Merge remote branch 'mainline/4.8'Casper van Donderen2011-08-311-33/+4
|\ | | | | | | | | | | Conflicts: tools/qdoc3/cppcodemarker.cpp tools/qdoc3/node.cpp
| * Merge remote-tracking branch 'upstream/4.8'Sergio Ahumada2011-08-291-10/+0
| |\ | | | | | | | | | | | | Conflicts: tools/qdoc3/cppcodemarker.cpp
| * \ Merge remote-tracking branch 'mainline/4.8'Oswald Buddenhagen2011-08-261-1/+2
| |\ \
| | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵v4.7.4Qt Continuous Integration System2011-08-231-1/+2
| | |\ \ | | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Fix problem with grabWindow on Mac OS X 10.6 with Cocoa don't crash when destroying children Fix compile issue with Mac OS X 10.5 Fix QPixmap::grabWindow() on Mac OS X Lion Update 4.7.4 changes
| | * | Modified \since command behavior slightly to handle project and version.David Boddie2011-06-301-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | (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.
| * | | remove unused functionsOswald Buddenhagen2011-08-221-31/+0
| | | |
| * | | Modified \since command behavior slightly to handle project and version.David Boddie2011-07-011-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (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)
* | | | Merge branch '4.8'Casper van Donderen2011-08-301-4/+46
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | Conflicts: doc/src/declarative/righttoleft.qdoc
| * | | qdoc3: Updates for QTBUG-20739 (no read-only for QML components)Martin Smith2011-08-111-0/+32
| | | | | | | | | | | | | | | | Task-number: QTBUG-20739
| * | | Phase 1 of QTBUG-20412, the XML manifest fileMartin Smith2011-07-151-4/+14
| |/ /
| * | Update licenseheader text in source files for qt4.8Jyri Tahtela2011-05-131-17/+17
| | | | | | | | | | | | | | | | | | | | | Updated version of LGPL and FDL licenseheaders. Apply release phase licenseheaders for all source files. Reviewed-by: Trust Me
* | | don't crash when destroying childrenKonstantin Ritt2011-08-221-1/+2
| |/ |/| | | | | | | | | this was uncovered by my don't-detach patch. Reviewed-by: ossi
* | Update licenseheader text in source filesJyri Tahtela2011-05-131-17/+17
|/ | | | | | | Updated version of LGPL and FDL licenseheaders. Apply release phase licenseheaders for all source files. Reviewed-by: Trust Me
* qdoc: Completed metadata handling.Martin Smith2011-03-241-39/+0
| | | | But not the default values part in the config file.
* qdoc: Added the <othermeta> element.Martin Smith2011-03-181-0/+15
|
* qdoc: Added <publisher> and <permissions> elements.Martin Smith2011-03-101-0/+16
|
* qdoc: Added Author> and <category> elements to the metadata.Martin Smith2011-03-071-0/+8
|
* Doc: Fixed handling of versioned properties and added documentation.David Boddie2011-02-221-78/+59
| | | | Task-number: QTBUG-13451
* Added a configuration variable for the QML documentation file prefix.David Boddie2011-02-031-1/+1
| | | | | | | | | This required a certain amount of refactoring to make the new variable visible to the relevant parts of the code. I also moved the fullDocumentLocation() function into the HtmlGenerator class, where it belongs. Task-number: QTBUG-17071
* Merge branch '4.7' of ../qt into 4.7David Boddie2011-01-131-1/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/declarative/qdeclarativeintro.qdoc doc/src/declarative/qdeclarativereference.qdoc doc/src/snippets/declarative/focus/focusColumn.qml tools/qdoc3/apigenerator.cpp tools/qdoc3/apigenerator.h tools/qdoc3/archiveextractor.cpp tools/qdoc3/bookgenerator.cpp tools/qdoc3/bookgenerator.h tools/qdoc3/ccodeparser.cpp tools/qdoc3/command.cpp tools/qdoc3/command.h tools/qdoc3/cpptoqsconverter.cpp tools/qdoc3/dcfsection.cpp tools/qdoc3/dcfsection.h tools/qdoc3/jambiapiparser.cpp tools/qdoc3/jambiapiparser.h tools/qdoc3/javacodemarker.cpp tools/qdoc3/javacodemarker.h tools/qdoc3/javadocgenerator.cpp tools/qdoc3/javadocgenerator.h tools/qdoc3/linguistgenerator.cpp tools/qdoc3/linguistgenerator.h tools/qdoc3/loutgenerator.h tools/qdoc3/mangenerator.cpp tools/qdoc3/mangenerator.h tools/qdoc3/polyarchiveextractor.cpp tools/qdoc3/polyarchiveextractor.h tools/qdoc3/polyuncompressor.cpp tools/qdoc3/polyuncompressor.h tools/qdoc3/qsakernelparser.cpp tools/qdoc3/qscodemarker.cpp tools/qdoc3/qscodemarker.h tools/qdoc3/qscodeparser.cpp tools/qdoc3/qscodeparser.h tools/qdoc3/sgmlgenerator.cpp tools/qdoc3/sgmlgenerator.h tools/qdoc3/test/qt-html-templates.qdocconf tools/qdoc3/uncompressor.cpp tools/qdoc3/webxmlgenerator.cpp tools/qdoc3/webxmlgenerator.h
| * Update copyright year to 2011.Jason McDonald2011-01-101-1/+1
| | | | | | | | Reviewed-by: Trust Me
* | Merge branch 'qdoc-simplified' into mimir-simplifiedDavid Boddie2010-12-071-5/+3
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/platforms/compiler-notes.qdoc tools/qdoc3/ditaxmlgenerator.cpp tools/qdoc3/ditaxmlgenerator.h tools/qdoc3/htmlgenerator.cpp tools/qdoc3/htmlgenerator.h tools/qdoc3/node.cpp tools/qdoc3/pagegenerator.h
| * | Added the foundations of QML markup support.David Boddie2010-11-281-1/+0
| | | | | | | | | | | | | | | | | | Use the QtDeclarative parser instead of Qt Creator's QML parser. Split the QML visitor into documentation and markup visitors. The code marker used for each file is now determined from its extension.
| * | Added a check for read-only pure QML properties before C++ checks.David Boddie2010-11-251-0/+3
| | |
| * | Removed unused code.David Boddie2010-11-221-5/+0
| |/
* | doc: Corrections to linking errors in the docs.Martin Smith2010-11-011-0/+15
| |
* | qdoc: Changed GUIDs from "{xxxxxx}" to "id-xxxxxxx".Martin Smith2010-10-181-7/+9
| |
* | qdoc: Updated with current dita xml generation code from oslo-staging-1.Martin Smith2010-09-071-2/+2
|/
* qdoc: Reorganized the QML elements table to be a dictionary...Martin Smith2010-08-181-2/+21
| | | | ...and a set of functional group pages.
* Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-07-221-0/+18
|\
| * Merge remote branch 'origin/4.7' into oslo-staging-1Aaron McCarthy2010-07-161-0/+18
| |\ | | | | | | | | | | | | Conflicts: tools/qdoc3/htmlgenerator.cpp
| | * Docs: HTML comments marks so Creator can extract data efficiently.Leandro Melo2010-07-141-0/+18
| | | | | | | | | | | | Reviewed-by: Martin Smith
* | | qdoc: Fixed reporting of read-only status for QML properties.Martin Smith2010-07-221-20/+198
|/ / | | | | | | Task-number: QTBUG-11512
* | qdoc: Fixed broken QML property links.Martin Smith2010-07-081-1/+1
|/ | | | Task-number: QTBUG-12038
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7David Boddie2010-06-281-2/+37
|\
| * doc: Added more DITA output to the XML generatorMartin Smith2010-06-251-2/+37
| | | | | | | | | | | | Output Q_PROPERTY as a cxxVariable. Task-number: QTBUG-11391
* | Merge branch '4.7' of /home/dboddie/git/oslo-staging-1 into 4.7David Boddie2010-06-251-5/+59
|\ \ | |/
| * doc: Added more DITA output to the XML generatorMartin Smith2010-06-221-2/+6
| | | | | | | | | | | | Some of the cxxVariable stuff for properties. Task-number: QTBUG-11391
| * qdoc3: Build fix for regression in e2f0e728eAndreas Kling2010-06-221-1/+1
| |
| * doc: Added more DITA output to the XML generatorMartin Smith2010-06-211-5/+8
| | | | | | | | | | | | cxxEnumeration stuff for enum types. Task-number: QTBUG-11391
| * doc: Added more DITA output to the XML generatorMartin Smith2010-06-211-4/+16
| | | | | | | | | | | | | | More cxxFunction stuff for member functions. Function parameters and other stuff. Task-number: QTBUG-11391
| * doc: Added more DITA output to the XML generatorMartin Smith2010-06-181-0/+35
| | | | | | | | | | | | More cxxFunction stuff for member functions. Task-number: QTBUG-11391
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/dboddies-oslo-staging-1-qdoc ↵David Boddie2010-06-181-0/+14
|\ \ | |/ | | | | into 4.7
generated by cgit v0.12 at 2024-09-18 01:27:19 (GMT)