summaryrefslogtreecommitdiffstats
path: root/doc/src/examples
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-teamDavid Boddie2011-05-061-1/+1
|\
| * Doc: Fixed typo.David Boddie2011-05-021-1/+1
| * Squashed commit of the changes from the mobile-examples repositoryDavid Boddie2011-04-2710-13/+16
* | Squashed commit of the changes from the mobile-examples repositoryDavid Boddie2011-04-2816-13/+943
|/
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/qtDavid Boddie2011-04-1821-104/+136
|\
| * Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-03-3121-104/+136
| |\
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7David Boddie2011-03-221-11/+43
| | |\
| | * | Doc: Fixed doc bug in undo framework exampleGeir Vattekar2011-03-171-2/+1
| | * | Doc: Fixed a doc bug in the Rogue exampleGeir Vattekar2011-03-071-2/+2
| | * | Doc: Converted the Internationalization with Qt document into a group.David Boddie2011-03-011-0/+1
| | * | Merge branch 'mimir' into 4.7David Boddie2011-02-233-50/+23
| | |\ \
| | | * | qdoc: Added the \span command.Martin Smith2011-01-241-42/+19
| | | * | qdoc: Removed some uses of \raw an d \endraw.Martin Smith2011-01-201-6/+2
| | | * | qdoc: Added colorizing of individual table cells.Martin Smith2011-01-141-2/+2
| | | * | Merge branch '4.7' into mimirDavid Boddie2010-12-151-1/+1
| | | |\ \
| | * | | | Removed GestureArea link from the elements page.Jerome Pasion2011-02-211-8/+1
| | * | | | Merge branch 'jpasions-qt-doc-team-qtquick-4.7' into 4.7David Boddie2011-02-171-14/+14
| | |\ \ \ \
| | | * \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Jerome Pasion2011-01-17257-257/+257
| | | |\ \ \ \
| | | * | | | | Re-organized the Qt Quick page. Changed titles and links.Jerome Pasion2010-12-201-14/+14
| | * | | | | | Doc: Fixed snippet.David Boddie2011-02-172-2/+31
| | * | | | | | Doc: Snippet quoting and other documentation fixes.David Boddie2011-02-093-3/+40
| | * | | | | | Doc: Ensured that code snippets have appropriate file names.David Boddie2011-02-0813-25/+25
* | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qtDavid Boddie2011-03-254-13/+45
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-03-221-10/+42
| |\ \ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | |
| | * | | | | | fixes/improvements for new QML right-to-left docsBea Lam2011-03-211-0/+6
| | * | | | | | Write Qt Quick 1.1 right-to-left documentation and examplesJoona Petrell2011-03-181-11/+37
| | |/ / / / /
| * | | | | | Update copyright year to 2011.Rohan McGovern2011-03-103-3/+3
* | | | | | | Doc: Added QtWebKit examples from Qt Quarterly 26 and 32.David Boddie2011-03-103-0/+674
* | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qtDavid Boddie2011-03-1013-27/+47
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-02-1012-22/+27
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Doc: Fixed warnings and other problems found while fixing markup.David Boddie2011-02-075-15/+15
| | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7David Boddie2011-02-042-5/+20
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2011-01-265-2/+8
| | |\ \ \ \ \ \
| | | * \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Geir Vattekar2011-01-251-1/+1
| | | |\ \ \ \ \ \
| | | | * | | | | | Doc: fixing bugs and typos based on feedbackMorten Engvoldsen2011-01-251-1/+1
| | | | | |_|/ / / | | | | |/| | | |
| | | * | | | | | Doc: Fixed missing images in qt demoGeir Vattekar2011-01-254-1/+7
| | | |/ / / / /
| | * | | | | | Doc: Fixed qdoc warnings about broken links.David Boddie2011-01-261-2/+2
| | |/ / / / /
| | * | | | | Merge branch '4.7' of ../qt into 4.7David Boddie2011-01-13257-257/+257
| | |\ \ \ \ \ | | | |_|/ / / | | |/| | | |
| | * | | | | Merge branch '4.7' into qdoc-simplifiedDavid Boddie2010-12-151-1/+1
| | |\ \ \ \ \ | | | |_|_|/ / | | |/| | | / | | | | |_|/ | | | |/| |
| | * | | | Merge branch 'qdoc-simplified' into mimir-simplifiedDavid Boddie2010-12-141-1/+2
| | |\ \ \ \
| | * \ \ \ \ Merge branch 'qdoc-simplified' into mimir-simplifiedDavid Boddie2010-12-071-2/+3
| | |\ \ \ \ \
| | * | | | | | doc: Corrections to linking errors detected by the DITA XML generator..Martin Smith2010-11-011-3/+2
| * | | | | | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-02-042-5/+20
| |\ \ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | |
| | * | | | | | Add initial size to ListView in FolderListModel exampleBea Lam2011-02-021-1/+6
| | * | | | | | Add a layout direction example to positionersJoona Petrell2011-01-191-4/+14
| | | |_|_|_|/ | | |/| | | |
* | | | | | | Doc: Mentioned the QQ Parenthesis article in two examplesGeir Vattekar2011-01-212-1/+13
|/ / / / / /
* | | | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-01-17257-257/+257
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Update copyright year to 2011.Jason McDonald2011-01-10257-257/+257
| | |_|_|/ | |/| | |
* | | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-12-231-1/+1
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Geir Vattekar2010-12-091-1/+2
| |\ \ \ \ | | | |_|/ | | |/| |