summaryrefslogtreecommitdiffstats
path: root/tools/qdoc3/node.h
Commit message (Collapse)AuthorAgeFilesLines
* 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>
* qdoc3: qdoc supports \depends in 4.8Martin Smith2011-11-211-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | 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
* Modified \since command behavior slightly to handle project and version.David Boddie2011-09-021-1/+1
| | | | | | | | | | (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
* qdoc3: Updates for QTBUG-20739 (no read-only for QML components)Martin Smith2011-08-111-0/+4
| | | | Task-number: QTBUG-20739
* Phase 1 of QTBUG-20412, the XML manifest fileMartin Smith2011-07-151-2/+23
|
* 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
* qdoc: Completed metadata handling.Martin Smith2011-03-241-13/+0
| | | | But not the default values part in the config file.
* qdoc: Added the <othermeta> element.Martin Smith2011-03-181-0/+4
|
* qdoc: Added <publisher> and <permissions> elements.Martin Smith2011-03-101-0/+6
|
* qdoc: Added Author> and <category> elements to the metadata.Martin Smith2011-03-071-0/+3
|
* Doc: Fixed handling of versioned properties and added documentation.David Boddie2011-02-221-0/+4
| | | | Task-number: QTBUG-13451
* 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-3/+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
| * | Trivial whitespace fixes.David Boddie2010-11-251-3/+3
| |/
* | doc: Corrections to linking errors in the docs.Martin Smith2010-11-011-0/+2
| |
* | qdoc: Changed GUIDs from "{xxxxxx}" to "id-xxxxxxx".Martin Smith2010-10-181-3/+2
|/
* Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-07-221-0/+1
|\
| * Docs: HTML comments marks so Creator can extract data efficiently.Leandro Melo2010-07-141-0/+1
| | | | | | | | Reviewed-by: Martin Smith
* | qdoc: Fixed reporting of read-only status for QML properties.Martin Smith2010-07-221-5/+13
|/ | | | Task-number: QTBUG-11512
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7David Boddie2010-06-281-67/+88
|\
| * doc: Added more DITA output to the XML generatorMartin Smith2010-06-251-67/+88
| | | | | | | | | | | | 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-0/+4
|\ \ | |/
| * qdoc3: Build fix for regression in e2f0e728eAndreas Kling2010-06-221-3/+2
| |
| * doc: Added more DITA output to the XML generatorMartin Smith2010-06-211-1/+2
| | | | | | | | | | | | | | 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/+4
| | | | | | | | | | | | 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-1/+6
|\ \ | |/ | | | | into 4.7
| * doc: Added more DITA output to the XML generatorMartin Smith2010-06-161-1/+6
| | | | | | | | | | | | Some of the cxxFunction stuff for member functions. Task-number: QTBUG-11391
* | qdoc: Added a workaround for QML/Qt class name clashes.David Boddie2010-06-181-3/+3
|/ | | | Reviewed-by: Trust Me
* doc: Added more DITA output to the XML generatorMartin Smith2010-06-151-0/+2
| | | | Task-number: QTBUG-11391
* Possible fix for missing QML properties in the qt.qhp file.Martin Smith2010-03-231-0/+8
| | | | | | Also adds more QML stuff to qt.index. Task: QTBUG-7724
* qdoc: Clear a static multimap after each qdocconf file.Martin Smith2010-03-081-0/+1
| | | | Task: QTBUG-8804
* qdoc: Second attempt, QML doc stuff.Martin Smith2010-03-021-3/+3
| | | | | | | | | | | | | This change caused a crash on several platforms before, but not on mine, of course. It outputs a list of new QML elements on the What's New in 4.7 page, and it outputs the "Inherited by" list on each QML elemnent page for elements that are inherited by other elements. I can't see why it should crash anything, but I have included some debug output. I think the crash might have something to do with QList<T>, which qdoc3 uses heavily. If it crashes for you, please get a stack trace and the debug output.
* Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1Martin Smith2010-02-261-3/+3
|\
| * Revert "qdoc: Finished "Inherited by" list for QML elements."Andreas Aardal Hanssen2010-02-251-3/+3
| | | | | | | | | | | | This reverts commit 83d7242271cf8196a8133de0406788135e16abbb. Reviewed-by: Martin Smith
* | doc: Added \since 4.7 to several \qmlclass elements.Martin Smith2010-02-261-1/+1
|/
* qdoc: Finished "Inherited by" list for QML elements.Martin Smith2010-02-191-3/+3
| | | | | | The listed elements are now links. Task: QTBUG-8153
* qdoc: Added "Inherited by" list to QML elements.Martin Smith2010-02-181-1/+5
| | | | | | But the listed elements are not links yet, just plain text. Task: QTBUG-8153
* qdoc3: Completed handling of the new \pagekeywords command.Martin Smith2010-02-111-1/+1
| | | | Task: QTBUG-7877
* qdoc3: Added curly braces in switch statement for braindead compiler.Martin Smith2010-02-111-0/+4
| | | | | | Also added the \pagekeywords command. Task: QTBUG-7877
* qdoc3: Added capability to create qt.pageindex.Martin Smith2010-02-101-2/+14
| | | | Task: QTBUG-7877
* qdoc3: Added support for the \qmlbasictype command.Martin Smith2010-02-031-1/+10
|
* Update copyright year to 2010Jason McDonald2010-01-061-1/+1
| | | | Reviewed-by: Trust Me
* doc: Example page now lists images used by the exampleMartin Smith2009-12-041-0/+1
| | | | | | | It just links to an empty page at the moment, i.e., it doesn't load the images. But I will add that. Task-number: QTBUG-4484
* qdoc3: Allow the full signature for QML signals and methodsMartin Smith2009-11-111-0/+2
| | | | | | | | ...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.
* qdoc3: Fixed a linking problem for qml methods.Martin Smith2009-11-111-30/+9
| | | | | | Note the Invalid Syntax errors for some uses of \qmlmethod and \qmlsignal. A syntactically correct signature is now required as the argument.
* qdoc updates for QMLWarwick Allison2009-11-041-2/+11
| | | | Reviewed-by:Michael Brasser