summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-review into 4.7David Boddie2011-01-3149-350/+405
|\
| * Merge branch '4.7-upstream' into 4.7-docA-Team2011-01-288-19/+65
| |\
| * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Geir Vattekar2011-01-2789-502/+1872
| |\ \
| | * | Doc: Fixed confusing wording of a sentence.David Boddie2011-01-271-2/+2
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7David Boddie2011-01-2667-290/+1602
| | |\ \
| | * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2011-01-264-4/+4
| | |\ \ \
| | * | | | Doc: Fixed qdoc warnings about broken links.David Boddie2011-01-262-2/+2
| | * | | | Doc: Fixed the syntax of QML code snippets.David Boddie2011-01-262-11/+16
| | * | | | Doc: Fixed broken QML code snippets.David Boddie2011-01-251-0/+2
| | * | | | Doc: Fixed qdoc warning.David Boddie2011-01-251-3/+3
| | * | | | Doc: Fixed the syntax of QML code snippets.David Boddie2011-01-247-58/+101
| | * | | | Merge branch '4.7' into qdoc-simplifiedDavid Boddie2011-01-213848-5214/+11408
| | |\ \ \ \
| | | * | | | Doc: Fixed QML syntax.David Boddie2011-01-192-15/+23
| | | * | | | Doc: Fixed inconsistent and incorrect terminology.David Boddie2011-01-181-1/+1
| | | * | | | Doc: Fixed invalid/incomplete QML code snippets.David Boddie2011-01-1710-98/+80
| | | * | | | Doc: Clarified the use of qUncompress().David Boddie2011-01-171-5/+5
| | * | | | | Doc: Fixed the syntax of QML code snippets.David Boddie2011-01-213-11/+13
| | * | | | | Doc: Fixed invalid QML snippets and marked up JavaScript correctly.David Boddie2011-01-201-33/+64
| * | | | | | Doc: Fixed typo in QCoreApplication docsGeir Vattekar2011-01-271-4/+4
| | |_|/ / / | |/| | | |
| * | | | | Doc: fixing bugs and typos based on feedbackMorten Engvoldsen2011-01-253-3/+3
| * | | | | Doc: fixing bugs and misspelling based on feedbackMorten Engvoldsen2011-01-251-1/+1
| | |/ / / | |/| | |
| * | | | Merge branch '4.7' of ../qt into 4.7David Boddie2011-01-133848-5016/+11220
| |\ \ \ \
| * | | | | Doc: Changed description to prevent confusion about managed widgets.David Boddie2011-01-101-3/+3
| * | | | | Doc: Fixed QML syntax in quoted code snippets.David Boddie2010-12-212-23/+5
| * | | | | Merge branch '4.7-upstream' into 4.7-docA-Team2010-12-205-8/+27
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch '4.7-upstream' into 4.7-docA-Team2010-12-181-1/+2
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch '4.7-upstream' into 4.7-docA-Team2010-12-174-1/+8
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch '4.7-upstream' into 4.7-docA-Team2010-12-1613-58/+64
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / | |/| | | | | | |
| * | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2010-12-167-32/+116
| |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge branch '4.7-upstream' into 4.7-docA-Team2010-12-157-32/+116
| | |\ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ Merge branch '4.7' into qdoc-simplifiedDavid Boddie2010-12-1571-372/+690
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / /
| * | | | | | | | | | Doc: Fixed an old-style float.David Boddie2010-12-151-1/+3
| * | | | | | | | | | Doc: Used div elements for floats, updated the style sheet.David Boddie2010-12-146-11/+33
| * | | | | | | | | | Merge branch 'qdoc-simplified' into mimir-simplifiedDavid Boddie2010-12-1447-440/+872
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Doc: Changed floating images to use the new float qdoc macros.David Boddie2010-12-136-36/+12
| * | | | | | | | | | | Merge branch 'qdoc-simplified' into mimir-simplifiedDavid Boddie2010-12-07434-6342/+9286
| |\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | doc: Corrections to linking errors in the docs.Martin Smith2010-11-013-7/+8
| * | | | | | | | | | | | doc: Corrections to linking errors detected by the DITA XML generator..Martin Smith2010-11-011-9/+18
| * | | | | | | | | | | | doc: Removed illegal \section1.Martin Smith2010-10-251-2/+1
| * | | | | | | | | | | | doc: Changed a \section in a \table into a \header.Martin Smith2010-10-251-1/+3
| * | | | | | | | | | | | doc: Changed a table into 3 tables to eliminate a \raw.Martin Smith2010-10-251-9/+10
| * | | | | | | | | | | | doc: Moved some table headers ahead of the rows.Martin Smith2010-10-223-10/+10
| * | | | | | | | | | | | doc: Moved some table headers before the rows.Martin Smith2010-10-201-9/+9
| * | | | | | | | | | | | doc: Moved some table headers to be before the rows.Martin Smith2010-10-201-6/+6
| * | | | | | | | | | | | Merge branch '4.7' into mimirMorten Engvoldsen2010-10-1549-599/+934
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch '4.7' into mimirMorten Engvoldsen2010-10-1318-35/+171
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch '4.7' into mimirMorten Engvoldsen2010-10-0996-587/+1865
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge commit 'origin/4.7' into mimirMorten Engvoldsen2010-10-06106-1096/+1166
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch '4.7' into mimirMorten Engvoldsen2010-10-0480-617/+7674
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'mimir' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into mimirMartin Smith2010-09-30116-5072/+1740
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \