Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote branch 'origin/master' | Thiago Macieira | 2010-02-23 | 16 | -34/+38 |
|\ | |||||
| * | Documentation Update | Alan Alpert | 2010-02-22 | 1 | -1/+5 |
| * | Doc fix | Alan Alpert | 2010-02-22 | 1 | -1/+1 |
| * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into master-integra... | Qt Continuous Integration System | 2010-02-22 | 18 | -35/+35 |
| |\ | |||||
| | * | Replace QmlList* and QList* support with a single QmlListProperty type | Aaron Kennedy | 2010-02-22 | 3 | -9/+9 |
| | * | Rename MouseRegion -> MouseArea | Martin Jones | 2010-02-22 | 15 | -26/+26 |
* | | | Merge branch 'master' of git:qt/qt | Thiago Macieira | 2010-02-21 | 41 | -80/+125 |
|\ \ \ | |/ / | |||||
| * | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master... | Qt Continuous Integration System | 2010-02-20 | 1 | -40/+85 |
| |\ \ | |||||
| | * \ | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master... | Qt Continuous Integration System | 2010-02-20 | 1 | -40/+85 |
| | |\ \ | | | |/ | | |/| | |||||
| | | * | Merge branch 'rtiff392' | aavit | 2010-02-20 | 1 | -39/+78 |
| | | |\ | |||||
| | | | * | license doc updated for libtiff 3.9.2 | aavit | 2010-02-16 | 1 | -39/+78 |
| | | * | | Merge branch 'rjpeg8' | aavit | 2010-02-20 | 1 | -7/+13 |
| | | |\ \ | |||||
| | | | * | | Update license doc, .pro file and qjpeghandler for libjpeg 8 | aavit | 2010-02-16 | 1 | -7/+13 |
| * | | | | | Doc: these files are NOT part of the test suite of the Qt toolkit | Thiago Macieira | 2010-02-20 | 46 | -46/+46 |
| * | | | | | Merge remote branch 'origin/master' into qt-master-from-4.6 | Thiago Macieira | 2010-02-20 | 10 | -53/+145 |
| |\ \ \ \ \ | | |/ / / / | |||||
| * | | | | | Merge remote branch 'origin/master' into qt-master-from-4.6 | Thiago Macieira | 2010-02-18 | 56 | -1059/+2410 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch '4.6' into qt-master-from-4.6 | Thiago Macieira | 2010-02-17 | 1 | -1/+1 |
| |\ \ \ \ \ \ | |||||
| | * \ \ \ \ \ | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ... | Qt Continuous Integration System | 2010-02-12 | 1 | -1/+1 |
| | |\ \ \ \ \ \ | |||||
| | | * | | | | | | doc: Fixed several typos. | Martin Smith | 2010-02-12 | 1 | -1/+1 |
* | | | | | | | | | Merge remote branch 'origin/master' | Thiago Macieira | 2010-02-20 | 10 | -53/+145 |
|\ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / | |/| | | | | | | | |||||
| * | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into master-integra... | Qt Continuous Integration System | 2010-02-19 | 9 | -52/+104 |
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / | |/| | | | | | | | |||||
| | * | | | | | | | doc | Warwick Allison | 2010-02-19 | 1 | -2/+5 |
| | * | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt | Martin Jones | 2010-02-18 | 56 | -1059/+2410 |
| | |\ \ \ \ \ \ \ | | | | |_|_|/ / / | | | |/| | | | | | |||||
| | * | | | | | | | Doc: reformulate why we build a button | Henrik Hartz | 2010-02-18 | 1 | -2/+3 |
| | * | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml | Martin Jones | 2010-02-18 | 2 | -46/+44 |
| | |\ \ \ \ \ \ \ | |||||
| | | * | | | | | | | Get rid of the matchProperties/properties distinction, as it | Michael Brasser | 2010-02-18 | 2 | -46/+44 |
| | * | | | | | | | | QmlView API review. See QmlChanges.txt for details. | Martin Jones | 2010-02-18 | 1 | -0/+9 |
| | |/ / / / / / / | |||||
| | * | | | | | | | Doc fix | Alan Alpert | 2010-02-17 | 1 | -1/+5 |
| | * | | | | | | | Fix minor doc typo | Alan Alpert | 2010-02-17 | 1 | -1/+1 |
| | * | | | | | | | Document loading QML from Qt resources. | Martin Jones | 2010-02-17 | 1 | -0/+36 |
| | * | | | | | | | Expose LayoutItem documentation | Alan Alpert | 2010-02-16 | 1 | -0/+1 |
| | * | | | | | | | transformOrigin defaults to Center, fix image/docs. | Warwick Allison | 2010-02-16 | 1 | -0/+0 |
| | | |/ / / / / | | |/| | | | | | |||||
| * | | | | | | | Merge remote branch 'qt/master' into staging-2-master | Qt Continuous Integration System | 2010-02-18 | 55 | -1053/+2404 |
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | / / | | |_|_|_|/ / | |/| | | | | | |||||
| * | | | | | | Merge remote branch 'qt/master' into staging-2-master | Qt Continuous Integration System | 2010-02-15 | 190 | -19/+8721 |
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | | | |||||
| * | | | | | | Merge branch 'qt-graphics-team-qstatictext-4.7' | Eskil Abrahamsen Blomfeldt | 2010-02-15 | 5 | -80/+57 |
| |\ \ \ \ \ \ | |||||
| | * \ \ \ \ \ | Merge branch 'master' of scm.dev.troll.no:qt/oslo-staging-2 into qstatictext-4.7 | Eskil Abrahamsen Blomfeldt | 2010-02-15 | 22 | -136/+166 |
| | |\ \ \ \ \ \ | | | | |_|_|_|/ | | | |/| | | | | |||||
| * | | | | | | | Update license doc and .pri file for libpng 1.4.0 | aavit | 2010-02-15 | 1 | -7/+47 |
| | |/ / / / / | |/| | | | | | |||||
* | | | | | | | Doc: Collected the Declarative UI tutorials together and renamed them. | David Boddie | 2010-02-19 | 12 | -777/+498 |
* | | | | | | | Doc: Simplified Commercial Editions for Qt 4.7. | David Boddie | 2010-02-19 | 11 | -137/+23 |
| |_|_|/ / / |/| | | | | | |||||
* | | | | | | 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 |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | |