summaryrefslogtreecommitdiffstats
path: root/doc
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public into merge-w...axis2010-02-1956-1059/+2410
|\
| * doc: Added "\sa {QML Basic Types} to each QML basic type page.Martin Smith2010-02-171-0/+17
| * doc: Fixed some qdoc errors.Martin Smith2010-02-167-8/+9
| * Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1Martin Smith2010-02-1640-613/+818
| |\
| | * Fix copyright year.Jason McDonald2010-02-161-1/+1
| | * Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1Jason McDonald2010-02-167-11/+13
| | |\
| | * | Fix broken license headers.Jason McDonald2010-02-1639-612/+817
| * | | doc: Fixed some qdoc errors.Martin Smith2010-02-162-2/+2
| | |/ | |/|
| * | doc: Fixed some qdoc errors.Martin Smith2010-02-164-7/+9
| * | doc: Fixed some qdoc errors.Martin Smith2010-02-163-4/+4
| |/
| * doc: Fixed some qdoc errors.Martin Smith2010-02-161-1/+5
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2010-02-139-424/+1546
| |\
| | * Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2010-02-129-424/+1546
| | |\
| | | * Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1David Boddie2010-02-106-26/+48
| | | |\
| | | * \ Merge branch 'qdoc-i18n'David Boddie2010-02-099-424/+1546
| | | |\ \
| | | | * | Doc/qdoc: Use Chinese titles; canonicalize titles with non-ASCII chars.David Boddie2010-02-084-10/+7
| | | | * | Doc/qdoc: Converted encoding of ISO-8859-1 docs to UTF-8. Output UTF-8.David Boddie2010-02-084-423/+423
| | | | * | Doc: Added Simplified Chinese documents and build rules for them.David Boddie2010-02-045-1/+1126
| | | | * | Merge commit 'origin/4.6' into oslo1-masterRohan McGovern2010-02-016-8/+28
| | | | |\ \
| * | | | \ \ Merge remote branch 'origin/master' into qt-master-from-4.6Thiago Macieira2010-02-13179-2/+8700
| |\ \ \ \ \ \ | | |/ / / / /
| * | | | | | Merge remote branch 'origin/4.6' into qt-master-from-4.6Thiago Macieira2010-02-1310-15/+17
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge remote branch 'origin/4.6' into qt-master-from-4.6Thiago Macieira2010-02-125-82/+61
| |\ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-publicaxis2010-02-16207-153/+8883
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into master-s60axis2010-02-1614-97/+78
| |\ \ \ \ \ \ \ \ | | | |_|/ / / / / | | |/| | / / / / | | |_|_|/ / / / | |/| | | | | |
| | * | | | | | Add make stub_sis target, and add webkit stub to qt.ibyShane Kearns2010-02-121-0/+2
| | * | | | | | doc: Fixed several typos.Martin Smith2010-02-129-15/+15
| | | |/ / / / | | |/| | | |
| * | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into master-integra...Qt Continuous Integration System2010-02-10179-2/+8700
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| | * | | | | Document QtObjectAlan Alpert2010-02-082-1/+2
| | * | | | | Better documentation of "model" and "modelData" in delegates.Martin Jones2010-02-081-5/+63
| | * | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into master-integra...Qt Continuous Integration System2010-02-05179-2/+8641
| | |\ \ \ \ \ | | | |_|/ / / | | |/| | | |
| | | * | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into master-integra...Qt Continuous Integration System2010-02-05179-2/+8641
| | | |\ \ \ \
| | | | * | | | Document QmlContext ownership.Martin Jones2010-02-041-1/+4
| | | | * | | | Merge branch 'kinetic-declarativeui' of git://git-nokia.trolltech.com.au/qtso...Warwick Allison2010-02-04179-2/+8638
| | | | |\ \ \ \
| | | | | * \ \ \ Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Martin Jones2010-02-043-173/+289
| | | | | |\ \ \ \
| | | | | | * | | | Augment documentationAlan Alpert2010-02-032-0/+32
| | | | | | * | | | doc: Converted the basic types page to use \qmlbasictypeMartin Smith2010-02-031-173/+257
| | | | | * | | | | Document calling C++ methods from QML.Martin Jones2010-02-041-0/+95
| | | | | |/ / / /
| | | | | * | | | We use JavaScript, not ECMAScript.Martin Jones2010-02-0312-38/+38
| | | | | * | | | Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic int...Bea Lam2010-02-036-8/+28
| | | | | |\ \ \ \
| | | | | | * \ \ \ Merge branch '4.6' of git://scm.dev.nokia.troll.no/qt/qt into kinetic-declara...Warwick Allison2010-02-026-8/+28
| | | | | | |\ \ \ \ | | | | | | | | |_|/ | | | | | | | |/| |
| | | | | * | | | | Disallow ids that start with uppercase letters and update docs andBea Lam2010-02-034-14/+21
| | | | | |/ / / /
| | | | | * | | | Fix QList<QObject*> as a model. Add docs and example.Martin Jones2010-02-011-5/+52
| | | | | * | | | Update advanced tutorial with new imagesAlan Alpert2010-02-014-1/+3
| | | | | * | | | Document possibility of -1 index in delegate.Martin Jones2010-01-291-0/+7
| | | | | * | | | Merge commit 'qt/4.6' into kinetic-declarativeuiBjørn Erik Nilsen2010-01-274-6/+6
| | | | | |\ \ \ \
| | | | | * \ \ \ \ Merge branch '4.6' of ../qt into kinetic-declarativeuiAaron Kennedy2010-01-202-2/+2
| | | | | |\ \ \ \ \
| | | | | * \ \ \ \ \ Merge branch '4.6' of ../qt into kinetic-declarativeuiAaron Kennedy2010-01-1917-140/+883
| | | | | |\ \ \ \ \ \
| | | | | * | | | | | | Doc fixes.Michael Brasser2010-01-151-1/+1
| | | | | * | | | | | | Merge branch '4.6' of git://scm.dev.nokia.troll.no/qt/qt into kinetic-declara...Warwick Allison2010-01-141244-1348/+1471
| | | | | |\ \ \ \ \ \ \
| | | | | * | | | | | | | Allow QML types defined in both C++ and QML files to be in the same module.Warwick Allison2010-01-081-1/+4