Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7 | David Boddie | 2011-03-22 | 9 | -29/+29 |
|\ | | | | | | | | | | | | | | | 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 | 9 | -28/+28 |
| | | | | | | | | Reviewed-by: Trust Me | ||||
| * | Bump Qt version to 4.7.3 | Timo Turunen | 2011-03-09 | 9 | -29/+29 |
| | | | | | | | | Reviewed-by: Trust Me | ||||
* | | qdoc: Avoid infinite loops in table of contents generation. | David Boddie | 2011-03-21 | 1 | -1/+4 |
| | | |||||
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7 | David Boddie | 2011-03-18 | 4 | -183/+185 |
|\ \ | |||||
| * | | qdoc: Added the <othermeta> element. | Martin Smith | 2011-03-18 | 3 | -1/+30 |
| | | | |||||
| * | | qdoc: Completed changing <section> structure. | Martin Smith | 2011-03-17 | 2 | -182/+155 |
| | | | | | | | | | | | | | | | | | | There appears to be a design flaw in the DITA language in that it doesn't allow the <title> element to appear inside a <bodydiv> <sectiondiv>. | ||||
* | | | Removed the documentation from the install rule. | David Boddie | 2011-03-18 | 1 | -1/+1 |
| | | | |||||
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7 | David Boddie | 2011-03-15 | 3 | -205/+264 |
|\ \ \ | |/ / | |||||
| * | | qdoc: Changed <section> structure. | Martin Smith | 2011-03-15 | 3 | -205/+264 |
| | | | | | | | | | | | | | | | | | | There appears to be a design flaw in the DIKT language in that it doesn't allow the <title> element to appear inside a <bodydiv> <sectiondiv>. | ||||
* | | | Doc: Fixed typo. | David Boddie | 2011-03-15 | 1 | -1/+1 |
| | | | |||||
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7 | David Boddie | 2011-03-14 | 4 | -14/+78 |
|\ \ \ | |/ / | |||||
| * | | qdoc: Added <publisher> and <permissions> elements. | Martin Smith | 2011-03-10 | 3 | -9/+45 |
| | | | |||||
| * | | qdoc: Added <component> element to contain the module name. | Martin Smith | 2011-03-10 | 1 | -1/+6 |
| | | | |||||
| * | | qdoc: Added <prodinfo> element and its contents to the metadata. | Martin Smith | 2011-03-09 | 2 | -5/+28 |
| | | | |||||
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7 | David Boddie | 2011-03-08 | 4 | -10/+162 |
|\ \ \ | |/ / | |||||
| * | | qdoc: Added Author> and <category> elements to the metadata. | Martin Smith | 2011-03-07 | 4 | -25/+103 |
| | | | |||||
| * | | qdoc: Added enum values and tag names for <prolog> and <metadata> | Martin Smith | 2011-03-04 | 2 | -6/+81 |
| | | | | | | | | | | | | These contain many subelements, whose tages were also added. | ||||
| * | | qdoc: Removed debug code. | Martin Smith | 2011-03-02 | 1 | -1/+0 |
| | | | |||||
* | | | Fixed invalid HTML output. | David Boddie | 2011-03-03 | 1 | -1/+1 |
|/ / | |||||
* | | qdoc: Added more descriptions for QML commands. | Martin Smith | 2011-03-01 | 1 | -138/+156 |
| | | |||||
* | | qdoc: Added more descriptions for QML commands. | Martin Smith | 2011-03-01 | 1 | -239/+284 |
| | | |||||
* | | qdoc: Added more descriptions for QML commands. | Martin Smith | 2011-02-28 | 1 | -132/+126 |
| | | |||||
* | | qdoc: Added more descriptions for QML commands. | Martin Smith | 2011-02-28 | 1 | -8/+69 |
| | | |||||
* | | qdoc: Added more descriptions for QML commands. | Martin Smith | 2011-02-28 | 1 | -15/+95 |
| | | |||||
* | | qdoc: Added more descriptions for QML commands. | Martin Smith | 2011-02-25 | 1 | -10/+29 |
| | | |||||
* | | qdoc: Began adding descriptions for QML commands. | Martin Smith | 2011-02-25 | 2 | -4/+123 |
| | | |||||
* | | qdoc: More updating command descriptions. | Martin Smith | 2011-02-25 | 1 | -769/+695 |
| | | |||||
* | | qdoc: More updating command descriptions. | Martin Smith | 2011-02-24 | 1 | -169/+115 |
| | | |||||
* | | qdoc: More updating command descriptions. | Martin Smith | 2011-02-24 | 1 | -210/+186 |
| | | |||||
* | | qdoc: More updating command descriptions. | Martin Smith | 2011-02-24 | 1 | -133/+123 |
| | | |||||
* | | qdoc: More updating command descriptions. | Martin Smith | 2011-02-24 | 1 | -113/+105 |
| | | |||||
* | | Merge branch 'mimir' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into mimir | Martin Smith | 2011-02-24 | 92 | -855/+4888 |
|\ \ | |||||
| * \ | Merge branch '4.7' into mimir | Morten Engvoldsen | 2011-02-23 | 92 | -855/+4888 |
| |\ \ | |||||
| | * \ | Merge branch 'mimir' into 4.7 | David Boddie | 2011-02-23 | 7 | -4999/+4877 |
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/declarative/qdeclarativemodels.qdoc doc/src/index.qdoc doc/src/template/style/style.css tools/qdoc3/atom.h tools/qdoc3/doc.cpp tools/qdoc3/doc/qdoc-manual.qdoc tools/qdoc3/doc/qdoc-manual.qdocconf | ||||
| | * | | | Doc: Fixed handling of versioned properties and added documentation. | David Boddie | 2011-02-22 | 3 | -85/+79 |
| | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-13451 | ||||
| | * | | | Doc: Removed help project declarations in the online configuration. | David Boddie | 2011-02-22 | 1 | -34/+0 |
| | | | | | |||||
| | * | | | Added a build rule for the qdoc3 manual. | David Boddie | 2011-02-17 | 1 | -3/+17 |
| | | | | | |||||
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7 | David Boddie | 2011-02-17 | 1 | -4/+2 |
| | |\ \ \ | |||||
| | | * | | | 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 |
| | | | | | | |||||
| | * | | | | Ensured that variables are scanned when generating the help index. | David Boddie | 2011-02-15 | 1 | -0/+8 |
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | Style option classes with obsolete variables had no obsolete pages in the compiled help files because, without other obsolete members to represent them, those pages were not added to the help project. | ||||
| | * | | | Doc: Added new configuration files for the qdoc manual. | David Boddie | 2011-02-14 | 23 | -234/+3969 |
| | | | | | |||||
| | * | | | Ensured that \code commands do not reuse the current code marker. | David Boddie | 2011-02-09 | 1 | -1/+1 |
| | | |/ | | |/| | |||||
| | * | | Ensured that trailing newlines are quoted and correct atoms are used. | David Boddie | 2011-02-05 | 2 | -5/+17 |
| | | | | | | | | | | | | | | | | | | | | | | | | Newlines after comments at the end of files were previously omitted. An assumption about the type code being quoted caused incorrect CSS classes to be used and extra HTML elements to be used. | ||||
| | * | | Fixed build breakage. | David Boddie | 2011-02-04 | 1 | -1/+1 |
| | | | | |||||
| | * | | Fixed C++ and plain markup found in \c commands. | David Boddie | 2011-02-04 | 1 | -6/+25 |
| | | | | |||||
| | * | | Added a configuration variable for the QML documentation file prefix. | David Boddie | 2011-02-03 | 10 | -175/+217 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7 | David Boddie | 2011-02-02 | 1 | -1/+1 |
| | |\ \ | |||||
| | | * | | Doc: Fixing typo | Sergio Ahumada | 2011-01-31 | 1 | -1/+1 |
| | | | | |