summaryrefslogtreecommitdiffstats
path: root/tools/qdoc3/cppcodeparser.cpp
Commit message (Collapse)AuthorAgeFilesLines
* 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-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: Updates to qdoc to print error message in ALL CAPSMartin Smith2011-08-291-2/+2
| | | | | | | when the path argument for an \example command refers to a directory that does not exist. Task-number: QTBUG-21165
* qdoc3: Updates for QTBUG-20776 and QTBUG-20777Martin Smith2011-08-101-3/+2
| | | | Task-number: QTBUG-20776, QTBUG-20777
* Phase 1 of QTBUG-20412, the XML manifest fileMartin Smith2011-07-151-4/+4
|
* 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
* Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Martin Smith2011-03-241-3/+3
|\
| * Edited QtWebKit Guide CSS chapter. Created example links.Jerome Pasion2011-03-171-3/+3
| | | | | | | | Reviewed-by: David Boddie
* | qdoc: Completed metadata handling.Martin Smith2011-03-241-0/+16
|/ | | | But not the default values part in the config file.
* Doc: Fixed handling of versioned properties and added documentation.David Boddie2011-02-221-7/+16
| | | | 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
* | Refactored use of parsers to parse files based on their types.David Boddie2010-11-241-5/+4
| | | | | | | | | | | | | | The full range of file types is specified in the configuration file. Each parser is asked if it handles each file. The pure documentation parser conceptually handles qdoc files, but it uses the same code as the C++ parser.
* | Removed unused code.David Boddie2010-11-221-10/+0
|/
* qdoc: Fixed reporting of read-only status for QML properties.Martin Smith2010-07-221-5/+27
| | | | Task-number: QTBUG-11512
* qdoc: Fixed a few links to QtObject (QML:QtObject)Martin Smith2010-07-071-13/+2
|
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7David Boddie2010-06-281-4/+28
|\
| * doc: Added more DITA output to the XML generatorMartin Smith2010-06-251-4/+28
| | | | | | | | | | | | Output Q_PROPERTY as a cxxVariable. Task-number: QTBUG-11391
* | qdoc: Added a workaround for QML/Qt class name clashes.David Boddie2010-06-181-1/+6
|/ | | | Reviewed-by: Trust Me
* Do not treat images in qml examples differently.Yann Bodson2010-04-221-23/+7
|
* Modify qdoc to handle qml examples files.Yann Bodson2010-04-201-23/+45
| | | | Reviewed-by: Michael Brasser
* doc: Fixed some qdoc errors.Martin Smith2010-03-041-1/+3
| | | | | | | The QtMultimedia module needed to have its own \page unique name so that the QtMultimedia \module would not conflict with the QtMultimedia \namespace.
* Merge remote branch 'berlin/4.7' into 4.7Oswald Buddenhagen2010-03-021-1/+0
|\
| * Introduce optional qdoc_bootstrapped qmake flagHarald Fernengel2010-03-011-1/+0
| | | | | | | | | | | | | | This allows building documentation even when cross-compiling. Note that for official documentation, you should always use your host's qdoc3 binary. This qmake option is for testing whether you introduced new qdoc warnings even if you don't have a native build around.
* | qdoc: Second attempt, QML doc stuff.Martin Smith2010-03-021-1/+1
|/ | | | | | | | | | | | | 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.
* Revert "qdoc: Finished "Inherited by" list for QML elements."Andreas Aardal Hanssen2010-02-251-1/+1
| | | | | | This reverts commit 83d7242271cf8196a8133de0406788135e16abbb. Reviewed-by: Martin Smith
* qdoc: Finished "Inherited by" list for QML elements.Martin Smith2010-02-191-1/+1
| | | | | | The listed elements are now links. Task: QTBUG-8153
* qdoc: Added "Inherited by" list to QML elements.Martin Smith2010-02-181-9/+4
| | | | | | But the listed elements are not links yet, just plain text. Task: QTBUG-8153
* Merge branch 'master' into qdoc-i18nDavid Boddie2010-02-031-1/+17
|\
| * qdoc3: Added support for the \qmlbasictype command.Martin Smith2010-02-031-1/+17
| |
* | qdoc: Added support for different source and output character encodings.David Boddie2010-02-021-6/+6
|/ | | | | | | | | | | | Previously, qdoc assumed Latin1 (ISO-8859-1) for source code and other documentation, and wrote out XHTML with the same encoding. This change adds additional configuration options (sourceencoding, outputencoding, naturallanguage) that enable translated documentation in non-Latin1 encodings to be built with qdoc. To be reviewed before merge into the master branch. Reviewed-by: Trust Me
* Update copyright year to 2010Jason McDonald2010-01-061-1/+1
| | | | Reviewed-by: Trust Me
* doc: Added a missing \sa command, plus a \l in the text.Martin Smith2009-12-181-3/+3
| | | | Task-number: QTBUG-6288
* doc: Example page now lists images used by the exampleMartin Smith2009-12-041-2/+65
| | | | | | | 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-20/+27
| | | | | | | | ...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-17/+53
| | | | | | 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-4/+17
| | | | Reviewed-by:Michael Brasser
* qdoc: Disabled reporting the NOTIFY signal until I know what it broke.Martin Smith2009-11-031-1/+0
| | | | Task-number: 259071
* qdoc3: Added the \qmlattachedsignal and \qmlattachedmethod.Martin Smith2009-10-231-4/+16
| | | | They works just like the \qmlsignal and \qmlmethod commands.
* qdoc3: Added the \qmlattachedproperty command.Martin Smith2009-10-191-6/+17
| | | | | | It works just like the \qmlproperty command, except that it puts the properties in a different section for attached properties.
* doc: Changed the format of the since list.Martin Smith2009-10-081-2/+4
| | | | | This is a big change from the original, and I expect we will want modifications.
* 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
* Update license headers again.Jason McDonald2009-09-091-4/+4
| | | | Reviewed-by: Trust Me
* Merge branch '4.5' into 4.6Thiago Macieira2009-08-311-13/+13
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: demos/boxes/glshaders.cpp demos/boxes/vector.h demos/embedded/fluidlauncher/pictureflow.cpp demos/embedded/fluidlauncher/pictureflow.h doc/src/desktop-integration.qdoc doc/src/distributingqt.qdoc doc/src/examples-overview.qdoc doc/src/examples.qdoc doc/src/frameworks-technologies/dbus-adaptors.qdoc doc/src/geometry.qdoc doc/src/groups.qdoc doc/src/objecttrees.qdoc doc/src/platform-notes.qdoc doc/src/plugins-howto.qdoc doc/src/qt3support.qdoc doc/src/qtdbus.qdoc doc/src/qtdesigner.qdoc doc/src/qtgui.qdoc doc/src/qtmain.qdoc doc/src/qtopengl.qdoc doc/src/qtsvg.qdoc doc/src/qtuiloader.qdoc doc/src/qundo.qdoc doc/src/richtext.qdoc doc/src/topics.qdoc src/corelib/tools/qdumper.cpp src/gui/embedded/qkbdpc101_qws.cpp src/gui/embedded/qkbdsl5000_qws.cpp src/gui/embedded/qkbdusb_qws.cpp src/gui/embedded/qkbdvr41xx_qws.cpp src/gui/embedded/qkbdyopy_qws.cpp src/gui/embedded/qmousebus_qws.cpp src/gui/embedded/qmousevr41xx_qws.cpp src/gui/embedded/qmouseyopy_qws.cpp src/gui/painting/qpaintengine_d3d.cpp src/gui/painting/qwindowsurface_d3d.cpp src/opengl/gl2paintengineex/glgc_shader_source.h src/opengl/gl2paintengineex/qglpexshadermanager.cpp src/opengl/gl2paintengineex/qglpexshadermanager_p.h src/opengl/gl2paintengineex/qglshader.cpp src/opengl/gl2paintengineex/qglshader_p.h src/opengl/util/fragmentprograms_p.h src/plugins/kbddrivers/linuxis/linuxiskbdhandler.cpp src/plugins/mousedrivers/linuxis/linuxismousehandler.cpp src/script/parser/qscript.g src/script/qscriptarray_p.h src/script/qscriptasm_p.h src/script/qscriptbuffer_p.h src/script/qscriptclass.cpp src/script/qscriptclassdata_p.h src/script/qscriptcompiler.cpp src/script/qscriptcompiler_p.h src/script/qscriptcontext.cpp src/script/qscriptcontext_p.cpp src/script/qscriptcontext_p.h src/script/qscriptcontextfwd_p.h src/script/qscriptecmaarray.cpp src/script/qscriptecmaarray_p.h src/script/qscriptecmaboolean.cpp src/script/qscriptecmacore.cpp src/script/qscriptecmadate.cpp src/script/qscriptecmadate_p.h src/script/qscriptecmaerror.cpp src/script/qscriptecmaerror_p.h src/script/qscriptecmafunction.cpp src/script/qscriptecmafunction_p.h src/script/qscriptecmaglobal.cpp src/script/qscriptecmaglobal_p.h src/script/qscriptecmamath.cpp src/script/qscriptecmamath_p.h src/script/qscriptecmanumber.cpp src/script/qscriptecmanumber_p.h src/script/qscriptecmaobject.cpp src/script/qscriptecmaobject_p.h src/script/qscriptecmaregexp.cpp src/script/qscriptecmaregexp_p.h src/script/qscriptecmastring.cpp src/script/qscriptecmastring_p.h src/script/qscriptengine.cpp src/script/qscriptengine_p.cpp src/script/qscriptengine_p.h src/script/qscriptenginefwd_p.h src/script/qscriptextenumeration.cpp src/script/qscriptextenumeration_p.h src/script/qscriptextqobject.cpp src/script/qscriptextqobject_p.h src/script/qscriptextvariant.cpp src/script/qscriptfunction.cpp src/script/qscriptfunction_p.h src/script/qscriptgc_p.h src/script/qscriptmember_p.h src/script/qscriptobject_p.h src/script/qscriptprettypretty.cpp src/script/qscriptprettypretty_p.h src/script/qscriptvalue.cpp src/script/qscriptvalueimpl.cpp src/script/qscriptvalueimpl_p.h src/script/qscriptvalueimplfwd_p.h src/script/qscriptvalueiteratorimpl.cpp src/script/qscriptxmlgenerator.cpp src/script/qscriptxmlgenerator_p.h tests/auto/linguist/lupdate/testdata/recursivescan/project.ui tests/auto/linguist/lupdate/testdata/recursivescan/sub/finddialog.cpp tests/auto/qkeyevent/tst_qkeyevent.cpp tools/linguist/shared/cpp.cpp
| * Update tech preview license header.Jason McDonald2009-08-311-13/+13
| | | | | | | | Reviewed-by: Trust Me
| * Update license headers.Jason McDonald2009-08-111-1/+1
| | | | | | | | Reviewed-by: Trust Me
* | qdoc: Fixed the bug that made reporting NOTIFY signals not work.Martin Smith2009-08-171-2/+2
| | | | | | | | | | | | | | | | | | | | The signal was being associated with a particular property, but in many classes, the NOTIFY signal applies to multiple properties. Added a new function to the PropertyNode class that adds the signal function without associating it with any property. Task-number: 259071
* | qdoc: Disabled reporting the NOTIFY signal until I know what it broke.Martin Smith2009-08-131-3/+2
| | | | | | | | Task-number: 259071
* | Update contact URL in license headers.Jason McDonald2009-08-121-1/+1
| | | | | | | | Reviewed-by: Trust Me
* | qdoc: List the NOTIFY signal function in the property doc.Martin Smith2009-08-101-0/+3
| |
generated by cgit v0.12 at 2025-02-12 22:07:46 (GMT)