summaryrefslogtreecommitdiffstats
path: root/tools/qdoc3/test
Commit message (Collapse)AuthorAgeFilesLines
* qdoc: Added default values to config file for DITAMartin Smith2011-03-251-0/+7
| | | | | | | | | | | Also added the handling of these default values: dita.metadata.default.author = Qt Development Frameworks dita.metadata.default.permissions = all dita.metadata.default.publisher = Nokia dita.metadata.default.copyryear = 2011 dita.metadata.default.copyrholder = Nokia dita.metadata.default.audience = programmer
* Merge branch 'clone_4.7' into 4.7Jerome Pasion2011-03-235-3/+260
|\
| * Edited QtWebKit Guide CSS chapter. Created example links.Jerome Pasion2011-03-174-3/+259
| | | | | | | | Reviewed-by: David Boddie
| * Adding QtWebKit Guide (BETA).Jerome Pasion2011-03-151-0/+1
| | | | | | | | Added images, new doc build configurations, and example code.
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7David Boddie2011-03-228-25/+25
|\ \ | |/ |/| | | | | | | | | | | Conflicts: doc/src/declarative/declarativeui.qdoc doc/src/declarative/dynamicobjects.qdoc doc/src/declarative/elements.qdoc doc/src/examples/qml-examples.qdoc
| * Bump Qt version to 4.7.4Timo Turunen2011-03-218-24/+24
| | | | | | | | Reviewed-by: Trust Me
| * Bump Qt version to 4.7.3Timo Turunen2011-03-098-25/+25
| | | | | | | | Reviewed-by: Trust Me
* | Doc: Removed help project declarations in the online configuration.David Boddie2011-02-221-34/+0
| |
* | Doc: correcting links in the online templatesMorten Engvoldsen2011-02-151-2/+1
| |
* | Doc: Updating platform support pages in the documentationMorten Engvoldsen2011-02-151-2/+1
|/
* Doc: Updated the copyright statements in the templates.David Boddie2011-02-012-2/+2
|
* Doc: Added a missing style sheet to the qhp manifest.David Boddie2011-01-281-1/+1
| | | | This may need to be cherry-picked into the 4.7.2 release.
* Doc: Fixed the qthelp namespace for the Qt documentation.David Boddie2011-01-281-1/+1
| | | | This may need to be cherry-picked into the 4.7.2 release.
* Removed a configuration file that can no longer be used.David Boddie2011-01-241-12/+0
|
* Doc: Updated the Qt version number.David Boddie2010-12-211-4/+4
|
* Doc: Fixed whitespace.David Boddie2010-12-213-11/+11
|
* Updated the offline template to use a new offline style sheet.David Boddie2010-12-172-17/+10
|
* Whitespace fixes.David Boddie2010-12-171-1/+1
|
* Removed macros for figures and floats. We'll use \div...\enddiv instead.David Boddie2010-12-141-32/+0
|
* Merge branch 'qdoc-simplified' into mimir-simplifiedDavid Boddie2010-12-145-53/+42
|\ | | | | | | | | | | Conflicts: tools/qdoc3/atom.h tools/qdoc3/qdoc3.pro
| * Added macros for floating images and floating images with alt text.David Boddie2010-12-131-0/+32
| | | | | | | | | | | | | | | | Ideally, these would be HTML-only macros, but the macro system doesn't know whether macro arguments used in pure HTML are file names, so the necessary files are not included. By using qdoc commands, we ensure the files are copied into the generated documentation's images directory.
| * Removed redundant style information and images.David Boddie2010-12-094-53/+10
| |
* | qdoc: Changed index.qdoc to use new \div commandMartin Smith2010-12-142-0/+2
| | | | | | | | | | | | | | | | This is necessary for the Mimir project, but it is also useful for writing html output in that now you can write the index page (and other such pages) using pure qdoc commands. i.e. you don't need to use raw html for this sort of thing anymore.
* | doc: Removed the \hr macro from the DITA XML qdocconf file.Martin Smith2010-12-091-1/+1
| | | | | | | | This eliminates some "raw-html" cases.
* | Updated the DITA configuration to use the new configuration structure.David Boddie2010-12-071-1/+1
| |
* | Merge branch 'qdoc-simplified' into mimir-simplifiedDavid Boddie2010-12-0730-2461/+1189
|\ \ | |/ | | | | | | | | | | | | | | | | | | 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
| * Merge branch '4.7' into qdoc-simplifiedDavid Boddie2010-11-307-20/+20
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * Merge remote branch 'qt/4.7' into 4.7Jason McDonald2010-11-182-3/+11
| | |\ | | | | | | | | | | | | | | | | | | | | Conflicts: tools/qdoc3/test/qt-build-docs.qdocconf tools/qdoc3/test/qt.qdocconf
| | | * qdoc: Added QML Elements to the Assistant indexMartin Smith2010-11-112-3/+11
| | | | | | | | | | | | | | | | Task-number: QTBUG-15081
| | * | Bump Qt version to 4.7.2.Jason McDonald2010-11-1211-36/+36
| | |/ | | | | | | | | | Reviewed-by: Trust Me
| * | Fixed grammar.David Boddie2010-11-292-2/+2
| | |
| * | Added the version number to the configuration and fixed the generator.David Boddie2010-11-241-1/+4
| | | | | | | | | | | | Now the version number should appear in the documentation again.
| * | Moved style-specific declarations. Removed script declarations.David Boddie2010-11-184-43/+70
| | |
| * | Started fixing qdoc's output to use some kind of page templates.David Boddie2010-11-1117-1137/+1139
| | | | | | | | | | | | | | | | | | | | | Removed hard-coded style and script information. Split .qdocconf files to help separate content and presentation. Task-number: QTBUG-15208
| * | Removed obsolete files.David Boddie2010-11-106-1336/+0
| |/ | | | | | | | | Apparently, these files are no longer used, being duplicates of those in doc/src/template.
| * Doc: Correcting character escape bugMorten Engvoldsen2010-11-041-1/+1
| |
| * Doc: updating the template to support search feature better.Morten Engvoldsen2010-11-031-1/+33
| |
* | qdoc: Fixed some reported bugs in the XML.Martin Smith2010-12-061-1/+7
| |
* | Merge branch '4.7' into mimirMorten Engvoldsen2010-10-091-2/+3
|\ \ | |/
| * Added Q_INVOKABLE to ignore file.Jerome Pasion2010-10-081-2/+3
| | | | | | | | | | Task-number: QTBUG-14281 Reviewed-by: David Boddie
* | Merge branch '4.7' into mimirMorten Engvoldsen2010-09-291-32/+8
|\ \ | |/
| * Merge branch '4.7' into newSearchMorten Engvoldsen2010-09-281-31/+0
| |\
| | * Doc: fixing bugs in slim-fit styleMorten Engvoldsen2010-09-281-31/+0
| | |
| * | Doc: Implementing new search displayMorten Engvoldsen2010-09-241-1/+8
| |/
* | Merge branch '4.7' into mimirMorten Engvoldsen2010-09-2312-38/+38
|\ \ | |/
| * Doc: maintainance - fixing grammar and spellingMorten Engvoldsen2010-09-231-2/+2
| |
| * Bump version to 4.7.1.Jason McDonald2010-09-2111-36/+36
| | | | | | | | Reviewed-by: Trust Me
* | Merge branch 'mimir' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into mimirMorten Engvoldsen2010-09-201-0/+31
|\ \ | |/ |/|
| * qdoc: DITA XML generator now uses <section> elements...Martin Smith2010-09-181-0/+31
| | | | | | | | | | | | ...instead of <p> elements with the outputclass attribute set to some h value. Also added some missing macros to qt-ditaxml.qdocconf, but there is more to think about here.
* | Doc: removing linebreakMorten Engvoldsen2010-09-161-1/+0
| |