Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | qdoc: Added default values to config file for DITA | Martin Smith | 2011-03-25 | 1 | -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.7 | Jerome Pasion | 2011-03-23 | 5 | -3/+260 |
|\ | |||||
| * | Edited QtWebKit Guide CSS chapter. Created example links. | Jerome Pasion | 2011-03-17 | 4 | -3/+259 |
| | | | | | | | | Reviewed-by: David Boddie | ||||
| * | Adding QtWebKit Guide (BETA). | Jerome Pasion | 2011-03-15 | 1 | -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.7 | David Boddie | 2011-03-22 | 8 | -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.4 | Timo Turunen | 2011-03-21 | 8 | -24/+24 |
| | | | | | | | | Reviewed-by: Trust Me | ||||
| * | Bump Qt version to 4.7.3 | Timo Turunen | 2011-03-09 | 8 | -25/+25 |
| | | | | | | | | Reviewed-by: Trust Me | ||||
* | | Doc: Removed help project declarations in the online configuration. | David Boddie | 2011-02-22 | 1 | -34/+0 |
| | | |||||
* | | Doc: correcting links in the online templates | Morten Engvoldsen | 2011-02-15 | 1 | -2/+1 |
| | | |||||
* | | Doc: Updating platform support pages in the documentation | Morten Engvoldsen | 2011-02-15 | 1 | -2/+1 |
|/ | |||||
* | Doc: Updated the copyright statements in the templates. | David Boddie | 2011-02-01 | 2 | -2/+2 |
| | |||||
* | Doc: Added a missing style sheet to the qhp manifest. | David Boddie | 2011-01-28 | 1 | -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 Boddie | 2011-01-28 | 1 | -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 Boddie | 2011-01-24 | 1 | -12/+0 |
| | |||||
* | Doc: Updated the Qt version number. | David Boddie | 2010-12-21 | 1 | -4/+4 |
| | |||||
* | Doc: Fixed whitespace. | David Boddie | 2010-12-21 | 3 | -11/+11 |
| | |||||
* | Updated the offline template to use a new offline style sheet. | David Boddie | 2010-12-17 | 2 | -17/+10 |
| | |||||
* | Whitespace fixes. | David Boddie | 2010-12-17 | 1 | -1/+1 |
| | |||||
* | Removed macros for figures and floats. We'll use \div...\enddiv instead. | David Boddie | 2010-12-14 | 1 | -32/+0 |
| | |||||
* | Merge branch 'qdoc-simplified' into mimir-simplified | David Boddie | 2010-12-14 | 5 | -53/+42 |
|\ | | | | | | | | | | | Conflicts: tools/qdoc3/atom.h tools/qdoc3/qdoc3.pro | ||||
| * | Added macros for floating images and floating images with alt text. | David Boddie | 2010-12-13 | 1 | -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 Boddie | 2010-12-09 | 4 | -53/+10 |
| | | |||||
* | | qdoc: Changed index.qdoc to use new \div command | Martin Smith | 2010-12-14 | 2 | -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 Smith | 2010-12-09 | 1 | -1/+1 |
| | | | | | | | | This eliminates some "raw-html" cases. | ||||
* | | Updated the DITA configuration to use the new configuration structure. | David Boddie | 2010-12-07 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'qdoc-simplified' into mimir-simplified | David Boddie | 2010-12-07 | 30 | -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-simplified | David Boddie | 2010-11-30 | 7 | -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.7 | Jason McDonald | 2010-11-18 | 2 | -3/+11 |
| | |\ | | | | | | | | | | | | | | | | | | | | | Conflicts: tools/qdoc3/test/qt-build-docs.qdocconf tools/qdoc3/test/qt.qdocconf | ||||
| | | * | qdoc: Added QML Elements to the Assistant index | Martin Smith | 2010-11-11 | 2 | -3/+11 |
| | | | | | | | | | | | | | | | | Task-number: QTBUG-15081 | ||||
| | * | | Bump Qt version to 4.7.2. | Jason McDonald | 2010-11-12 | 11 | -36/+36 |
| | |/ | | | | | | | | | | Reviewed-by: Trust Me | ||||
| * | | Fixed grammar. | David Boddie | 2010-11-29 | 2 | -2/+2 |
| | | | |||||
| * | | Added the version number to the configuration and fixed the generator. | David Boddie | 2010-11-24 | 1 | -1/+4 |
| | | | | | | | | | | | | Now the version number should appear in the documentation again. | ||||
| * | | Moved style-specific declarations. Removed script declarations. | David Boddie | 2010-11-18 | 4 | -43/+70 |
| | | | |||||
| * | | Started fixing qdoc's output to use some kind of page templates. | David Boddie | 2010-11-11 | 17 | -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 Boddie | 2010-11-10 | 6 | -1336/+0 |
| |/ | | | | | | | | | Apparently, these files are no longer used, being duplicates of those in doc/src/template. | ||||
| * | Doc: Correcting character escape bug | Morten Engvoldsen | 2010-11-04 | 1 | -1/+1 |
| | | |||||
| * | Doc: updating the template to support search feature better. | Morten Engvoldsen | 2010-11-03 | 1 | -1/+33 |
| | | |||||
* | | qdoc: Fixed some reported bugs in the XML. | Martin Smith | 2010-12-06 | 1 | -1/+7 |
| | | |||||
* | | Merge branch '4.7' into mimir | Morten Engvoldsen | 2010-10-09 | 1 | -2/+3 |
|\ \ | |/ | |||||
| * | Added Q_INVOKABLE to ignore file. | Jerome Pasion | 2010-10-08 | 1 | -2/+3 |
| | | | | | | | | | | Task-number: QTBUG-14281 Reviewed-by: David Boddie | ||||
* | | Merge branch '4.7' into mimir | Morten Engvoldsen | 2010-09-29 | 1 | -32/+8 |
|\ \ | |/ | |||||
| * | Merge branch '4.7' into newSearch | Morten Engvoldsen | 2010-09-28 | 1 | -31/+0 |
| |\ | |||||
| | * | Doc: fixing bugs in slim-fit style | Morten Engvoldsen | 2010-09-28 | 1 | -31/+0 |
| | | | |||||
| * | | Doc: Implementing new search display | Morten Engvoldsen | 2010-09-24 | 1 | -1/+8 |
| |/ | |||||
* | | Merge branch '4.7' into mimir | Morten Engvoldsen | 2010-09-23 | 12 | -38/+38 |
|\ \ | |/ | |||||
| * | Doc: maintainance - fixing grammar and spelling | Morten Engvoldsen | 2010-09-23 | 1 | -2/+2 |
| | | |||||
| * | Bump version to 4.7.1. | Jason McDonald | 2010-09-21 | 11 | -36/+36 |
| | | | | | | | | Reviewed-by: Trust Me | ||||
* | | Merge branch 'mimir' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into mimir | Morten Engvoldsen | 2010-09-20 | 1 | -0/+31 |
|\ \ | |/ |/| | |||||
| * | qdoc: DITA XML generator now uses <section> elements... | Martin Smith | 2010-09-18 | 1 | -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 linebreak | Morten Engvoldsen | 2010-09-16 | 1 | -1/+0 |
| | |