summaryrefslogtreecommitdiffstats
path: root/doc/src
Commit message (Expand)AuthorAgeFilesLines
* Rewrote QML Property Binding document. Added snippet code.Jerome Pasion2011-01-133-254/+630
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Jerome Pasion2011-01-131-4/+9
|\
| * Doc: correcting merge errorMorten Engvoldsen2011-01-121-4/+9
| * Adding a link to the coding style wiki page.Jerome Pasion2011-01-071-0/+5
* | Added content and snippet code to Basic Elements overview page.Jerome Pasion2011-01-074-8/+97
* | Re-organized the elements page. Fixed misplaced elements.Jerome Pasion2011-01-061-113/+156
* | Fixed merge conflictJerome Pasion2011-01-051-4/+0
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Jerome Pasion2011-01-0517-659/+1316
|\ \ | |/
| * 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
| |\ \ \ | | |_|/ | |/| |
| * | | 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
| |\ \ \
| * | | | Whitespace fixes.David Boddie2010-12-171-553/+533
* | | | | Re-organized the Qt Quick page. Changed titles and links.Jerome Pasion2010-12-2031-689/+1249
* | | | | Adding two QML Best Practice guides.Jerome Pasion2010-12-202-0/+143
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Jerome Pasion2010-12-2028-275/+710
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | 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
| |/ / /
| * | | 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
| | |\ \
| | * | | Doc: Added a note about the Public Suffix List.David Boddie2010-12-101-30/+51
| * | | | Merge branch '4.7' into qdoc-simplifiedDavid Boddie2010-12-1512-24/+389
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Merge branch '4.7-upstream' into 4.7-docA-Team2010-12-139-21/+385
| | |\ \ \ | | | | |/ | | | |/|
| | | * | Improvements to anchoring docsBea Lam2010-12-091-17/+49
| | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-12-098-4/+336
| | | |\ \
| | | | * | Document support for QVariantList and QVariantMap type conversionBea Lam2010-12-064-1/+156
| | | | * | Some doc clarification for components and javascript integrationBea Lam2010-12-061-3/+2
| | | | * | Qt.include() docs weren't being picked up by qdocBea Lam2010-12-064-0/+178
| * | | | | 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
| |\ \ \ \ \
| | * | | | | 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