summaryrefslogtreecommitdiffstats
path: root/tools/qdoc3/node.cpp
Commit message (Collapse)AuthorAgeFilesLines
* 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
| * 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
|\ \ | |/