summaryrefslogtreecommitdiffstats
path: root/doc
Commit message (Expand)AuthorAgeFilesLines
* Doc: these files are NOT part of the test suite of the Qt toolkitThiago Macieira2010-02-2046-46/+46
* Merge remote branch 'origin/master' into qt-master-from-4.6Thiago Macieira2010-02-2010-53/+145
|\
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into master-integra...Qt Continuous Integration System2010-02-199-52/+104
| |\
| | * docWarwick Allison2010-02-191-2/+5
| | * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qtMartin Jones2010-02-1856-1059/+2410
| | |\
| | * | Doc: reformulate why we build a buttonHenrik Hartz2010-02-181-2/+3
| | * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlMartin Jones2010-02-182-46/+44
| | |\ \
| | | * | Get rid of the matchProperties/properties distinction, as itMichael Brasser2010-02-182-46/+44
| | * | | QmlView API review. See QmlChanges.txt for details.Martin Jones2010-02-181-0/+9
| | |/ /
| | * | Doc fixAlan Alpert2010-02-171-1/+5
| | * | Fix minor doc typoAlan Alpert2010-02-171-1/+1
| | * | Document loading QML from Qt resources.Martin Jones2010-02-171-0/+36
| | * | Expose LayoutItem documentationAlan Alpert2010-02-161-0/+1
| | * | transformOrigin defaults to Center, fix image/docs.Warwick Allison2010-02-161-0/+0
| * | | Merge remote branch 'qt/master' into staging-2-masterQt Continuous Integration System2010-02-1855-1053/+2404
| |\ \ \ | | | |/ | | |/|
| * | | Merge remote branch 'qt/master' into staging-2-masterQt Continuous Integration System2010-02-15190-19/+8721
| |\ \ \ | | | |/ | | |/|
| * | | Merge branch 'qt-graphics-team-qstatictext-4.7'Eskil Abrahamsen Blomfeldt2010-02-155-80/+57
| |\ \ \
| | * \ \ Merge branch 'master' of scm.dev.troll.no:qt/oslo-staging-2 into qstatictext-4.7Eskil Abrahamsen Blomfeldt2010-02-1522-136/+166
| | |\ \ \
| * | | | | Update license doc and .pri file for libpng 1.4.0aavit2010-02-151-7/+47
| | |/ / / | |/| | |
* | | | | Merge remote branch 'origin/master' into qt-master-from-4.6Thiago Macieira2010-02-1856-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 branch '4.6' into qt-master-from-4.6Thiago Macieira2010-02-171-1/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-02-121-1/+1
| |\ \ \ \ \ \ \
| | * | | | | | | doc: Fixed several typos.Martin Smith2010-02-121-1/+1
* | | | | | | | | Merge remote branch 'origin/master' into qt-master-from-4.6Thiago Macieira2010-02-13179-2/+8700
|\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | |
| * | | | | | | | 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
| | | | | |\ \ \ \ \ \