summaryrefslogtreecommitdiffstats
path: root/doc/src
Commit message (Collapse)AuthorAgeFilesLines
...
| | | * | | | | | | | | | | | Merge branch '4.7' of ../qt into 4.7David Boddie2011-01-131533-1737/+1854
| | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | | * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2011-01-132-4/+14
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / | | | | |/| | | | | | | | | | |
| | | | * | | | | | | | | | | | Doc: correcting merge errorMorten Engvoldsen2011-01-121-4/+9
| | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | Adding a link to the coding style wiki page.Jerome Pasion2011-01-071-0/+5
| | | | | |_|_|_|_|_|_|/ / / / | | | | |/| | | | | | | | | |
| | | * | | | | | | | | | | | Doc: Added a missing snippet.David Boddie2011-01-131-0/+51
| | | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-16619
| | | * | | | | | | | | | | Doc: Sync with upstream.David Boddie2010-12-221-1/+1
| | | | | | | | | | | | | |
| | | * | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2010-12-216-15/+9
| | | |\ \ \ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2010-12-212-29/+29
| | | | |\ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | Doc: Changed a page title.David Boddie2010-12-215-6/+6
| | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | Doc: Updated the HarfBuzz license information.David Boddie2010-12-211-9/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As-requested-by: Legal
| | | * | | | | | | | | | | | | Doc: Fixed QML syntax in quoted code snippets.David Boddie2010-12-212-1/+62
| | | | |/ / / / / / / / / / / | | | |/| | | | | | | | | | |
| | | * | | | | | | | | | | | Merge branch 'qdoc-simplified' into 4.7David Boddie2010-12-212-29/+29
| | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / | | | |/| | | | | | | | | | |
| | | * | | | | | | | | | | | Merge branch '4.7-upstream' into 4.7-docA-Team2010-12-202-1/+5
| | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2010-12-202-1/+40
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|_|_|/ / / / | | | | |/| | | | | | | | | | |
| | | | * | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Jerome Pasion2010-12-201-1/+1
| | | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | | | * \ \ \ \ \ \ \ \ \ \ \ Merge branch '4.7-upstream' into 4.7-docA-Team2010-12-171-1/+1
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | Added BSD license to snippet code.Jerome Pasion2010-12-201-0/+39
| | | | |/ / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | Doc: Fixed the syntax of QML code snippets.David Boddie2011-01-213-92/+85
| | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | Doc: Ensured that text in tables is not too large.David Boddie2011-01-201-1/+0
| | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | Added a style for types in quoted code.David Boddie2011-01-202-0/+8
| | | |_|_|_|/ / / / / / / / / / | | |/| | | | | | | | | | | | |
| | * | | | | | | | | | | | | | Doc: Fixed whitespace.David Boddie2010-12-212-29/+29
| | |/ / / / / / / / / / / / /
| | * | | | | | | | | | | | | Updated the offline template to use a new offline style sheet.David Boddie2010-12-171-0/+662
| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | Doc: Fixed whitespace.David Boddie2010-12-171-61/+14
| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | Doc: Fixed broken links.David Boddie2010-12-173-12/+10
| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | Merge branch '4.7' into qdoc-simplifiedDavid Boddie2010-12-171-30/+51
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / /
| | | * | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2010-12-161-30/+51
| | | |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | Whitespace fixes.David Boddie2010-12-171-553/+533
| | |/ / / / / / / / / / / / /
| | * | | | | | | | | | | | | Merge branch '4.7' into qdoc-simplifiedDavid Boddie2010-12-1512-24/+389
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|/ / / | | |/| | | | | | | | | | / / | | | | |_|_|_|_|_|_|_|_|/ / | | | |/| | | | | | | | | |
| | * | | | | | | | | | | | Doc: Used div elements for floats, updated the style sheet.David Boddie2010-12-145-10/+35
| | | | | | | | | | | | | |
| | * | | | | | | | | | | | Merge branch 'qdoc-simplified' into mimir-simplifiedDavid Boddie2010-12-1467-695/+2365
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: tools/qdoc3/atom.h tools/qdoc3/qdoc3.pro
| | | * | | | | | | | | | | | Doc: Changed floating images to use the new float qdoc macros.David Boddie2010-12-134-25/+9
| | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | Doc: Fixed non-well-formed XHTML.David Boddie2010-12-131-14/+14
| | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | Doc: Whitespace fix.David Boddie2010-12-131-1/+1
| | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | Doc: Temporarily used \qml...\endqml markup for the QML introduction.David Boddie2010-12-091-43/+32
| | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | Merge branch '4.7' into qdoc-simplifiedDavid Boddie2010-12-076-18/+65
| | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch '4.7' into qdoc-simplifiedDavid Boddie2010-12-0758-594/+2244
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | qdoc: Changed index.qdoc to use new \div commandMartin Smith2010-12-141-79/+87
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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: Replaced some \raw and \endraw uses with \table and \endtableMartin Smith2010-12-131-82/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In DITA XML, there is no straightforward way to translate raw html into DITA XML, because the XML stream writer automagically escapes all the raw html elements. So I am beginning to replace uses of the \raw command with \table, which gets output correctly. The problem is the XML stream writer must see each XML element start and end, because it keeps them on a stack. When you output XML elements with the writeCharacters() function, it escapes the '<' and '>' of any XML elements the character string contains.
| | * | | | | | | | | | | | | | | doc: Replaced some \raw and \endraw uses with \table and \endtableMartin Smith2010-12-138-2692/+768
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In DITA XML, there is no straightforward way to translate raw html into DITA XML, because the XML stream writer automagically escapes all the raw html elements. So I am beginning to replace uses of the \raw command with \table, which gets output correctly. The problem is the XML stream writer must see each XML element start and end, because it keeps them on a stack. When you output XML elements with the writeCharacters() function, it escapes the '<' and '>' of any XML elements the character string contains.
| | * | | | | | | | | | | | | | | doc: Eliminated some "raw-html" cases.Martin Smith2010-12-131-336/+91
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | More to come.
| | * | | | | | | | | | | | | | | doc: Removed some empty \row commands from a table.Martin Smith2010-12-091-3/+0
| | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | Merge branch 'qdoc-simplified' into mimir-simplifiedDavid Boddie2010-12-07112-1132/+3984
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | | * | | | | | | | | | | | | | Doc: Added new style colors, increased the contrast of existing colors.David Boddie2010-12-071-3/+18
| | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | doc: Corrections to linking errors detected by the DITA XML generator..Martin Smith2010-11-013-6/+5
| | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | qdoc: Fixed some DITA XML validation errors.Martin Smith2010-10-281-5/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed some \table problems as well.
| | * | | | | | | | | | | | | | | doc: Removed an illegal char and some empty \row commands.Martin Smith2010-10-272-4/+1
| | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | doc: Removed some illegal characters.Martin Smith2010-10-271-8/+8
| | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | doc: Removed an illegal character.Martin Smith2010-10-271-1/+1
| | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | doc: Fixed some DITA XML validation errors.Martin Smith2010-10-252-2/+1
| | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | doc: Moved many \target commands that were in the wrong place.Martin Smith2010-10-251-35/+27
| | | | | | | | | | | | | | | | |
generated by cgit v0.12 at 2025-04-24 15:07:35 (GMT)