summaryrefslogtreecommitdiffstats
path: root/tools/qdoc3/node.cpp
Commit message (Collapse)AuthorAgeFilesLines
* 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
| * doc: Added more DITA output to the XML generatorMartin Smith2010-06-161-0/+14
| | | | | | | | | | | | 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-1/+12
|/ | | | Reviewed-by: Trust Me
* doc: Added more DITA output to the XML generatorMartin Smith2010-06-151-0/+35
| | | | Task-number: QTBUG-11391
* Fixed qdoc3 crash.Rohan McGovern2010-06-091-3/+3
| | | | Fixes "Invalid read of size 4" reported by valgrind.
* qdoc: Added more API topics. Are these important?Martin Smith2010-05-031-1/+1
|
* Merge remote branch 'origin/4.7' into 4.7Olivier Goffart2010-04-011-1/+1
|\ | | | | | | | | Conflicts: src/gui/text/qstatictext.cpp
| * Fix compilation with Sun CC:Thiago Macieira2010-03-291-1/+1
| | | | | | | | | | | | "node.cpp", line 1337: Error: There is extra text on this line. Reviewed-by: Trust Me
* | Merge remote branch 'origin/4.7' into 4.7Olivier Goffart2010-03-251-11/+11
|\ \ | |/ | | | | | | | | Conflicts: tools/qdoc3/generator.cpp tools/qdoc3/node.cpp
| * qdoc3: Fixed some ifdef typos and removed some whitespace.Martin Smith2010-03-171-6/+6
| |
* | Fix warnings and build on mingwThierry Bastian2010-03-251-3/+3
|/
* qdoc: ifdefed out all the debug code.Martin Smith2010-03-151-0/+6
| | | | | I think the crash that occurs when running qdoc over multiple qdocconf files is fixed.
* CompileKent Hansen2010-03-111-1/+1
|
* qdoc: Fixed lookup of QML property nodes.Martin Smith2010-03-111-0/+17
| | | | | At this point, no QML qdoc errors appear in the output. There is still a lot of debug output.
* qdoc: Clear a static multimap after each qdocconf file.Martin Smith2010-03-081-0/+9
| | | | Task: QTBUG-8804
* qdoc: Added some debug output to track down a crashMartin Smith2010-03-081-2/+2
| | | | The crash doesn't happen on my OS X 10.4.
* qdoc3: Trying to find a bug that causes a crash.Martin Smith2010-03-031-1/+4
| | | | | | | | It doesn't crash on OS X, but it does on some other platforms. If you run into this crash running qdoc3, you can work around it by commenting out line 1539 in tools/qdoc3/htmlgenerator.cpp The line to comment out is: generateQmlInheritedBy(qml_cn, marker);
* Compile.Morten Johan Sørvig2010-03-021-0/+1
|
* Merge remote branch 'berlin/4.7' into 4.7Oswald Buddenhagen2010-03-021-2/+2
|\
| * Introduce optional qdoc_bootstrapped qmake flagHarald Fernengel2010-03-011-2/+2
| | | | | | | | | | | | | | 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-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | 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-4/+4
|\ \ | |/
| * Revert "qdoc: Finished "Inherited by" list for QML elements."Andreas Aardal Hanssen2010-02-251-4/+4
| | | | | | | | | | | | This reverts commit 83d7242271cf8196a8133de0406788135e16abbb. Reviewed-by: Martin Smith
* | doc: Added \since 4.7 to several \qmlclass elements.Martin Smith2010-02-261-0/+8
|/
* qdoc: Finished "Inherited by" list for QML elements.Martin Smith2010-02-191-4/+4
| | | | | | The listed elements are now links. Task: QTBUG-8153
* qdoc: Added "Inherited by" list to QML elements.Martin Smith2010-02-181-0/+20
| | | | | | But the listed elements are not links yet, just plain text. Task: QTBUG-8153
* qdoc3: Added curly braces in switch statement for braindead compiler.Martin Smith2010-02-111-1/+1
| | | | | | Also added the \pagekeywords command. Task: QTBUG-7877
* qdoc3: Added capability to create qt.pageindex.Martin Smith2010-02-101-2/+48
| | | | Task: QTBUG-7877
* qdoc3: Removed a debug output.Martin Smith2010-02-041-2/+0
|
* qdoc3: Added support for the \qmlbasictype command.Martin Smith2010-02-031-2/+26
|
* 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-1/+11
| | | | | | | 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/+7
| | | | | | | | ...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-27/+65
| | | | | | 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-1/+3
| | | | Reviewed-by:Michael Brasser
* qdoc3: Added the \qmlattachedsignal and \qmlattachedmethod.Martin Smith2009-10-231-4/+8
| | | | They works just like the \qmlsignal and \qmlmethod commands.
* qdoc3: Added the \qmlattachedproperty command.Martin Smith2009-10-191-4/+10
| | | | | | 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-18/+88
| | | | | This is a big change from the original, and I expect we will want modifications.
* qdoc: Modified the support for \sincelist.Martin Smith2009-09-301-0/+17
| | | | It now finds a lot more \since 4.6 stuff.
* 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