Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 4.7 into qt-master-from-4.7 | Qt Continuous Integration System | 2011-04-09 | 1 | -1/+1 |
|\ | |||||
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵ | Qt Continuous Integration System | 2011-04-08 | 1 | -1/+1 |
| |\ | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: make -markuntranslated work without -idbased fix conditional on shell type | ||||
| | * | fix conditional on shell type | Oswald Buddenhagen | 2011-04-08 | 1 | -1/+1 |
| | | | |||||
* | | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2011-04-07 | 51 | -312/+13785 |
|\ \ \ | |/ / | | | | | | | | | | | | | Conflicts: src/gui/text/qfontengine_mac.mm tests/auto/qdiriterator/tst_qdiriterator.cpp | ||||
| * | | Fixed the declarative headers and includes within qdoc. | David Boddie | 2011-04-05 | 22 | -56/+56 |
| | | | |||||
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7 | David Boddie | 2011-04-05 | 12 | -102/+346 |
| |\ \ | |||||
| | * | | qdoc: Allowed multiple values for certain metadata tags. | Martin Smith | 2011-04-05 | 9 | -44/+152 |
| | | | | | | | | | | | | | | | | | | | | Also output mainters for classes in the HTML output, if there are maintainers listed. | ||||
| | * | | qdoc: modified \include to take a 2nd arg, snippet id. | Martin Smith | 2011-04-01 | 4 | -33/+123 |
| | |/ | |||||
| | * | qdoc: Updates to the qdoc manual. | Martin Smith | 2011-03-30 | 1 | -25/+71 |
| | | | |||||
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7 | David Boddie | 2011-03-29 | 7 | -69/+116 |
| |\ \ | | |/ | |||||
| | * | qdoc: Updates to the qdoc manual. | Martin Smith | 2011-03-28 | 1 | -53/+38 |
| | | | |||||
| | * | qdoc: Added a way to exclude directories from receiving default metadata | Martin Smith | 2011-03-28 | 1 | -0/+20 |
| | | | | | | | | | | | | But it is ifdefed out because I think we won't use it. | ||||
| | * | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7 | Martin Smith | 2011-03-25 | 20 | -35/+12902 |
| | |\ | |||||
| | * | | qdoc: Added default values to config file for DITA | Martin Smith | 2011-03-25 | 5 | -16/+58 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
| * | | | Removed some links and prettified others. | David Boddie | 2011-03-25 | 1 | -12/+26 |
| | |/ | |/| | |||||
| * | | Avoided the use of hard-coded file names. | David Boddie | 2011-03-24 | 1 | -34/+70 |
| | | | |||||
| * | | Copied the declarative parser into qdoc3 to avoid dependency issues. | David Boddie | 2011-03-24 | 19 | -1/+12832 |
| |/ | |||||
| * | qdoc: Don't wrap <image> in <fig> if in an <xref> | Martin Smith | 2011-03-24 | 1 | -2/+4 |
| | | |||||
| * | qdoc: Added <copyright>, <copyryear>, and <copyrholder>. | Martin Smith | 2011-03-24 | 1 | -3/+19 |
| | | |||||
| * | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7 | Martin Smith | 2011-03-24 | 16 | -39/+299 |
| |\ | |||||
| | * | Merge branch 'clone_4.7' into 4.7 | Jerome Pasion | 2011-03-23 | 6 | -6/+263 |
| | |\ | |||||
| | | * | Adopting changes from a merge with qt-doc-team repo, 4.7 branch | Jerome Pasion | 2011-03-22 | 3 | -3/+3 |
| | | | | |||||
| | | * | Merge remote branch 'remotes/qt-doc-team/4.7' into 4.7 | Jerome Pasion | 2011-03-18 | 5 | -321/+382 |
| | | |\ | |||||
| | | * | | Edited QtWebKit Guide CSS chapter. Created example links. | Jerome Pasion | 2011-03-17 | 5 | -6/+262 |
| | | | | | | | | | | | | | | | | | | | | 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. | ||||
| * | | | | qdoc: Completed metadata handling. | Martin Smith | 2011-03-24 | 8 | -126/+152 |
| | |_|/ | |/| | | | | | | | | | | But not the default values part in the config file. | ||||
* | | | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2011-03-31 | 37 | -6866/+10873 |
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/declarative/example-slideswitch.qdoc doc/src/development/qmake-manual.qdoc doc/src/snippets/code/doc_src_qmake-manual.pro doc/src/snippets/code/doc_src_qtscript.qdoc src/corelib/animation/qabstractanimation.cpp src/s60installs/bwins/QtOpenGLu.def src/s60installs/eabi/QtOpenGLu.def src/s60installs/eabi/QtOpenVGu.def tests/auto/qdir/qdir.pro tests/auto/qsslsocket/tst_qsslsocket.cpp tools/qdoc3/doc/qdoc-manual.qdocconf | ||||
| * | | | 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 | ||||
| * | | | | 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 |
| | | |