summaryrefslogtreecommitdiffstats
path: root/tools/qdoc3/htmlgenerator.h
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.7' into qdoc-simplifiedDavid Boddie2011-01-211-1/+1
|\ | | | | | | | | | | Conflicts: src/declarative/graphicsitems/qdeclarativeitem.cpp src/declarative/util/qdeclarativeanimation.cpp
| * 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
* | | Enabled syntax highlighting by default.David Boddie2011-01-201-1/+0
| | | | | | | | | | | | | | | Removed the linksinmarkup configuration option because it was not introduced in all relevant places.
* | | Define what the -slow command line option does.David Boddie2011-01-181-1/+1
|/ / | | | | | | | | Added configuration options for syntax highlighting and linking. These are also enabled if the -slow command line option is used.
* | Removed obsolete configuration options.David Boddie2010-12-171-4/+0
| |
* | Merge branch '4.7' into qdoc-simplifiedDavid Boddie2010-11-301-1/+1
|\ \ | |/ | | | | | | | | | | | | | | | | Conflicts: tools/qdoc3/htmlgenerator.cpp tools/qdoc3/htmlgenerator.h tools/qdoc3/test/qt-build-docs.qdocconf tools/qdoc3/test/qt.qdocconf tools/qdoc3/test/qt_ja_JP.qdocconf tools/qdoc3/test/qt_zh_CN.qdocconf
| * qdoc: Fixed virtualness and constness of the fileBase() function.Martin Smith2010-11-111-1/+1
| | | | | | | | Task-number: QTBUG-13939
* | Added the foundations of QML markup support.David Boddie2010-11-281-3/+2
| | | | | | | | | | | | 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.
* | Removed unused code.David Boddie2010-11-241-25/+0
| |
* | Removed unused files and functionality from qdoc3.David Boddie2010-11-191-11/+0
| | | | | | | | | | | | | | | | Many of the generators were unused. The old QSA and Qt Script parsers were unused. We no longer use DCF files for Qt Assistant. We no longer generate Qt Jambi documentation, and qdoc3 was not used for much of that process, making some of the relevant files obsolete.
* | Started fixing qdoc's output to use some kind of page templates.David Boddie2010-11-111-8/+3
|/ | | | | | | Removed hard-coded style and script information. Split .qdocconf files to help separate content and presentation. Task-number: QTBUG-15208
* qdoc: Reorganized the QML elements table to be a dictionary...Martin Smith2010-08-161-0/+1
| | | | ...and a set of functional group pages.
* qdoc: All references to -assistant and -base were removed.Martin Smith2010-08-121-1/+0
| | | | | Flags allowed are now -creator and -online. -creator is the default.
* qdoc: Added list of all members (including inherited) page to QML elements.Martin Smith2010-08-111-1/+4
|
* qdoc: Cleaned up the application option specification and use.Martin Smith2010-08-051-3/+6
| | | | | | | | | The flags allowed on the command line are now: -online (default), -base, -assistant (same as -base), and -creator. If you don't specify one of these, you see a warning in the error output telling you that it didn't find an application flag and that it generated online docs by defualt.
* Fixed the following sub-tasks for QTBUG-12192Kevin Wright2010-07-261-0/+5
| | | | | | | | | | | | | | | | | | * Qt Simulator link missing * Integration and add-ins (on the front page, link leads to an alternative start page) * Qt Creator (on the front page link leads to Manual version 1.3) * Getting Started (on the front page) link broken * More... (in Global Declarations) link broken Additionally: There was an issue with the documentation used within Assistant/Creator that appears to have no bug report filed. An alternate "offline" form of the documentation (inspired by the newly redesigned online version) was being installed, but had significant issues within Assistant and Creator. It appears that within qdoc3 some changes had been made towards using this newer documentation format, but those changes were not working properly. I fixed qdoc3 so that the original offline documentation design is the default, but there is room to use the configuration files to call the any of the three documentation designs (new online, new offline, and old offline).
* Merge remote branch 'origin/4.7' into oslo-staging-1Aaron McCarthy2010-07-161-0/+7
|\ | | | | | | | | Conflicts: tools/qdoc3/htmlgenerator.cpp
| * Docs: HTML comments marks so Creator can extract data efficiently.Leandro Melo2010-07-141-0/+7
| | | | | | | | Reviewed-by: Martin Smith
* | qdoc: Removed navigation arrow that was causing display problems.Martin Smith2010-07-141-0/+1
| | | | | | | | Task-number: QTBUG-12157, QTBUG-12148, QTBUG-12146
* | Doc: Adding support for Qt Creator styleMorten Engvoldsen2010-07-091-0/+1
| | | | | | | | | | | | Adding a variable to the qdocconf file will now generate the docs in Creator format Reviewed-by: Martin Smith
* | qdoc: Removed a lot of dead code to minimize confusion.Martin Smith2010-07-071-6/+0
| |
* | qdoc: Fixed the case where the property and type names are the same.Martin Smith2010-07-071-3/+4
|/ | | | | | Also simplified some code. Task-number: QTBUG-6340
* qdoc: Simplified code to enable fixing of QTBUG-6340.Martin Smith2010-07-061-20/+5
| | | | | | Also reworded some of the text for QTBUG-11575. Task-number: QTBUG-6340, QTBUG-11575
* qdoc: Fixed type linking for QML properties (most of them).Martin Smith2010-07-051-0/+2
| | | | Task-number: QTBUG-6340
* qdoc: Fixed class list problem.Martin Smith2010-05-041-0/+1
| | | | | Task: QTBUG-10373 Task: QTBUG-10382
* qdoc: Sprinkled more breadcrumbs.Martin Smith2010-04-281-2/+3
|
* qdoc: Removed MacRefs for Xcode documentation stuff.Martin Smith2010-04-271-1/+8
| | | | Also added the infrastructure for generating breadcrumbs.
* qdoc: Added online flag to the qdocconf file.Martin Smith2010-04-191-0/+1
| | | | | | | To generate the offline docs, do nothing. To generate the online docs, add this to your qdocconf file: "online = true"
* qdoc: Improved TOC for class ref pages.Martin Smith2010-04-161-1/+3
|
* qdoc: Added new table of contents for non-class ref pagesMartin Smith2010-04-131-0/+1
| | | | This feature is not complete in this commit.
* qdoc: Second attempt, QML doc stuff.Martin Smith2010-03-021-0/+2
| | | | | | | | | | | | | 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: List new QML elements in \sincelist for What's New page."Andreas Aardal Hanssen2010-02-251-2/+0
| | | | | | This reverts commit d1b4e4666e4fe1a5fae0571c37535159c097f485. Reviewed-By: Martin Smith
* qdoc: List new QML elements in \sincelist for What's New page.Martin Smith2010-02-221-0/+2
|
* qdoc: Added "Inherited by" list to QML elements.Martin Smith2010-02-181-0/+1
| | | | | | But the listed elements are not links yet, just plain text. Task: QTBUG-8153
* Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1David Boddie2010-02-101-1/+11
|\
| * qdoc3: Added capability to create qt.pageindex.Martin Smith2010-02-101-1/+11
| | | | | | | | Task: QTBUG-7877
* | qdoc: Added support for different source and output character encodings.David Boddie2010-02-021-1/+2
|/ | | | | | | | | | | | 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
* qdoc: Made the \sincelist command produce better html.Martin Smith2009-10-141-4/+5
|
* doc: Changed the format of the since list.Martin Smith2009-10-081-17/+42
| | | | | 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-3/+5
| | | | It now finds a lot more \since 4.6 stuff.
* qdoc: Added "since" 4.6 lists to the "What's New" page.Martin Smith2009-09-211-0/+3
| | | | In test/qt.qdocconf, change %VERSION% to 4.6, for example.
* 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
* | Update contact URL in license headers.Jason McDonald2009-08-121-1/+1
| | | | | | | | Reviewed-by: Trust Me
* | Merge branch 'master' of git://git-nokia.trolltech.com.au/qtsoftware/qt/qtAaron Kennedy2009-07-301-0/+1
|\ \
| * | qdoc: Added -obsoletelinks flag to opt in for reporting obsolete links.Martin Smith2009-07-291-0/+1
| | |
generated by cgit v0.12 at 2024-12-28 23:18:39 (GMT)