Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public into merge-w... | axis | 2010-02-19 | 56 | -1059/+2410 |
|\ | |||||
| * | doc: Added "\sa {QML Basic Types} to each QML basic type page. | Martin Smith | 2010-02-17 | 1 | -0/+17 |
| * | doc: Fixed some qdoc errors. | Martin Smith | 2010-02-16 | 7 | -8/+9 |
| * | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 | Martin Smith | 2010-02-16 | 40 | -613/+818 |
| |\ | |||||
| | * | Fix copyright year. | Jason McDonald | 2010-02-16 | 1 | -1/+1 |
| | * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 | Jason McDonald | 2010-02-16 | 7 | -11/+13 |
| | |\ | |||||
| | * | | Fix broken license headers. | Jason McDonald | 2010-02-16 | 39 | -612/+817 |
| * | | | doc: Fixed some qdoc errors. | Martin Smith | 2010-02-16 | 2 | -2/+2 |
| | |/ | |/| | |||||
| * | | doc: Fixed some qdoc errors. | Martin Smith | 2010-02-16 | 4 | -7/+9 |
| * | | doc: Fixed some qdoc errors. | Martin Smith | 2010-02-16 | 3 | -4/+4 |
| |/ | |||||
| * | doc: Fixed some qdoc errors. | Martin Smith | 2010-02-16 | 1 | -1/+5 |
| * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master... | Qt Continuous Integration System | 2010-02-13 | 9 | -424/+1546 |
| |\ | |||||
| | * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master... | Qt Continuous Integration System | 2010-02-12 | 9 | -424/+1546 |
| | |\ | |||||
| | | * | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 | David Boddie | 2010-02-10 | 6 | -26/+48 |
| | | |\ | |||||
| | | * \ | Merge branch 'qdoc-i18n' | David Boddie | 2010-02-09 | 9 | -424/+1546 |
| | | |\ \ | |||||
| | | | * | | Doc/qdoc: Use Chinese titles; canonicalize titles with non-ASCII chars. | David Boddie | 2010-02-08 | 4 | -10/+7 |
| | | | * | | Doc/qdoc: Converted encoding of ISO-8859-1 docs to UTF-8. Output UTF-8. | David Boddie | 2010-02-08 | 4 | -423/+423 |
| | | | * | | Doc: Added Simplified Chinese documents and build rules for them. | David Boddie | 2010-02-04 | 5 | -1/+1126 |
| | | | * | | Merge commit 'origin/4.6' into oslo1-master | Rohan McGovern | 2010-02-01 | 6 | -8/+28 |
| | | | |\ \ | |||||
| * | | | \ \ | Merge remote branch 'origin/master' into qt-master-from-4.6 | Thiago Macieira | 2010-02-13 | 179 | -2/+8700 |
| |\ \ \ \ \ \ | | |/ / / / / | |||||
| * | | | | | | Merge remote branch 'origin/4.6' into qt-master-from-4.6 | Thiago Macieira | 2010-02-13 | 10 | -15/+17 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge remote branch 'origin/4.6' into qt-master-from-4.6 | Thiago Macieira | 2010-02-12 | 5 | -82/+61 |
| |\ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public | axis | 2010-02-16 | 207 | -153/+8883 |
|\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into master-s60 | axis | 2010-02-16 | 14 | -97/+78 |
| |\ \ \ \ \ \ \ \ | | | |_|/ / / / / | | |/| | / / / / | | |_|_|/ / / / | |/| | | | | | | |||||
| | * | | | | | | Add make stub_sis target, and add webkit stub to qt.iby | Shane Kearns | 2010-02-12 | 1 | -0/+2 |
| | * | | | | | | doc: Fixed several typos. | Martin Smith | 2010-02-12 | 9 | -15/+15 |
| | | |/ / / / | | |/| | | | | |||||
| * | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into master-integra... | Qt Continuous Integration System | 2010-02-10 | 179 | -2/+8700 |
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | |||||
| | * | | | | | Document QtObject | Alan Alpert | 2010-02-08 | 2 | -1/+2 |
| | * | | | | | Better documentation of "model" and "modelData" in delegates. | Martin Jones | 2010-02-08 | 1 | -5/+63 |
| | * | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into master-integra... | Qt Continuous Integration System | 2010-02-05 | 179 | -2/+8641 |
| | |\ \ \ \ \ | | | |_|/ / / | | |/| | | | | |||||
| | | * | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into master-integra... | Qt Continuous Integration System | 2010-02-05 | 179 | -2/+8641 |
| | | |\ \ \ \ | |||||
| | | | * | | | | Document QmlContext ownership. | Martin Jones | 2010-02-04 | 1 | -1/+4 |
| | | | * | | | | Merge branch 'kinetic-declarativeui' of git://git-nokia.trolltech.com.au/qtso... | Warwick Allison | 2010-02-04 | 179 | -2/+8638 |
| | | | |\ \ \ \ | |||||
| | | | | * \ \ \ | Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic... | Martin Jones | 2010-02-04 | 3 | -173/+289 |
| | | | | |\ \ \ \ | |||||
| | | | | | * | | | | Augment documentation | Alan Alpert | 2010-02-03 | 2 | -0/+32 |
| | | | | | * | | | | doc: Converted the basic types page to use \qmlbasictype | Martin Smith | 2010-02-03 | 1 | -173/+257 |
| | | | | * | | | | | Document calling C++ methods from QML. | Martin Jones | 2010-02-04 | 1 | -0/+95 |
| | | | | |/ / / / | |||||
| | | | | * | | | | We use JavaScript, not ECMAScript. | Martin Jones | 2010-02-03 | 12 | -38/+38 |
| | | | | * | | | | Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic int... | Bea Lam | 2010-02-03 | 6 | -8/+28 |
| | | | | |\ \ \ \ | |||||
| | | | | | * \ \ \ | Merge branch '4.6' of git://scm.dev.nokia.troll.no/qt/qt into kinetic-declara... | Warwick Allison | 2010-02-02 | 6 | -8/+28 |
| | | | | | |\ \ \ \ | | | | | | | | |_|/ | | | | | | | |/| | | |||||
| | | | | * | | | | | Disallow ids that start with uppercase letters and update docs and | Bea Lam | 2010-02-03 | 4 | -14/+21 |
| | | | | |/ / / / | |||||
| | | | | * | | | | Fix QList<QObject*> as a model. Add docs and example. | Martin Jones | 2010-02-01 | 1 | -5/+52 |
| | | | | * | | | | Update advanced tutorial with new images | Alan Alpert | 2010-02-01 | 4 | -1/+3 |
| | | | | * | | | | Document possibility of -1 index in delegate. | Martin Jones | 2010-01-29 | 1 | -0/+7 |
| | | | | * | | | | Merge commit 'qt/4.6' into kinetic-declarativeui | Bjørn Erik Nilsen | 2010-01-27 | 4 | -6/+6 |
| | | | | |\ \ \ \ | |||||
| | | | | * \ \ \ \ | Merge branch '4.6' of ../qt into kinetic-declarativeui | Aaron Kennedy | 2010-01-20 | 2 | -2/+2 |
| | | | | |\ \ \ \ \ | |||||
| | | | | * \ \ \ \ \ | Merge branch '4.6' of ../qt into kinetic-declarativeui | Aaron Kennedy | 2010-01-19 | 17 | -140/+883 |
| | | | | |\ \ \ \ \ \ | |||||
| | | | | * | | | | | | | Doc fixes. | Michael Brasser | 2010-01-15 | 1 | -1/+1 |
| | | | | * | | | | | | | Merge branch '4.6' of git://scm.dev.nokia.troll.no/qt/qt into kinetic-declara... | Warwick Allison | 2010-01-14 | 1244 | -1348/+1471 |
| | | | | |\ \ \ \ \ \ \ | |||||
| | | | | * | | | | | | | | Allow QML types defined in both C++ and QML files to be in the same module. | Warwick Allison | 2010-01-08 | 1 | -1/+4 |