summaryrefslogtreecommitdiffstats
path: root/doc/src
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Geir Vattekar2011-01-2513-286/+286
|\
| * Doc: Fixing typoMorten Engvoldsen2011-01-251-1/+1
| * Doc: fixing bugs and typos based on feedbackMorten Engvoldsen2011-01-2511-12/+12
| * Doc: fixing bugs and misspelling based on feedbackMorten Engvoldsen2011-01-252-273/+273
* | Doc: Fixed missing images in qt demoGeir Vattekar2011-01-2510-2/+8
|/
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2011-01-141-113/+156
|\
| * Changed the QML Elements page groupings.Jerome Pasion2011-01-141-113/+156
* | Merge branch '4.7' of ../qt into 4.7David Boddie2011-01-131533-1737/+1854
|\ \
| * | Attempt to cure my pathological inability to type the word "package".Jason McDonald2011-01-111-1/+1
| * | Update copyright year to 2011.Jason McDonald2011-01-101533-1548/+1548
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-01-062-1/+2
| |\ \
| | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-12-232-1/+2
| | |\ \
| | | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-12-222-1/+2
| | | |\ \
| | | | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-12-212-1/+2
| | | | |\ \
| | | | | * | Fix number of chapters in qtestlib tutorial.Jason McDonald2010-12-211-1/+1
| | | | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-12-201-0/+1
| | | | | |\ \
| | | | | | * | Make it clear which security updates are needed for Visual Studio 2005.Jason McDonald2010-12-201-0/+1
| * | | | | | | Update docs - calling overloaded functions from QML is now supportedBea Lam2011-01-061-5/+8
| * | | | | | | Doc fixes for introduction page and Item docsBea Lam2011-01-061-83/+130
| |/ / / / / /
| * | | | | | Improve docs on attached properties on view delegates.Martin Jones2010-12-234-8/+50
| |/ / / / /
| * | | | | Document the 'variant' basic typeBea Lam2010-12-222-12/+87
| * | | | | Add double type to QML Basic Types docsBea Lam2010-12-221-0/+20
| * | | | | Remove redundant docsBea Lam2010-12-221-81/+0
| |/ / / /
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/doc-staging into 4.7-integrationQt Continuous Integration System2010-12-2143-3438/+1895
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Doc: Added a missing license header.David Boddie2010-12-211-0/+39
* | | | | 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
|/ / / /
* | | | 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
* | | | | | 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
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Doc: Fixed whitespace.David Boddie2010-12-212-29/+29
* | | | | Merge branch '4.7-upstream' into 4.7-docA-Team2010-12-202-1/+5
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Update docs on importing javascript filesBea Lam2010-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
| | |\ \ \ | | | |/ /
| | | * | Doc: typo fixed in doc/src/declarative/extending.qdocJoerg Bornemann2010-12-161-1/+1
| * | | | Added BSD license to snippet code.Jerome Pasion2010-12-201-0/+39
| |/ / /
* | | | 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
| |\ \ \ | | | |/ | | |/|
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2010-12-1520-3133/+1276
| | |\ \