Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2010-10-25 | 1 | -5/+5 |
|\ | | | | | | | | | | | | | | | | | | | Conflicts: demos/declarative/snake/snake.qml qmake/generators/symbian/symbiancommon.cpp src/network/access/qnetworkaccessmanager.cpp src/s60installs/s60installs.pro tests/auto/qitemselectionmodel/tst_qitemselectionmodel.cpp tests/auto/qnetworkreply/tst_qnetworkreply.cpp | ||||
| * | Doc: Fixed the in-repository licenses for the documentation. | David Boddie | 2010-10-04 | 1 | -5/+5 |
| | | | | | | | | | | | | In the repository, we should always use the No Commercial license alongside the GNU Free Documentation License for documentation files. | ||||
* | | Fix typo in declative example. | Frederik Gladhorn | 2010-09-10 | 1 | -1/+1 |
|/ | | | | Review-by: trust me | ||||
* | doc: Fixed some qdoc errors. | Martin Smith | 2010-08-09 | 1 | -1/+1 |
| | |||||
* | Doc: Relicensed the documentation under the GNU FDL version 1.3. | David Boddie | 2010-06-21 | 1 | -25/+11 |
| | | | | | Reviewed-by: Trust Me Requested-by: Legal | ||||
* | Restructure the examples. They are now organized into various | Bea Lam | 2010-05-16 | 1 | -10/+10 |
| | | | | | | subdirectories to make it easier to locate examples for certain features (e.g. animation) and to distinguish between different types of examples (e.g. very basic examples vs complex demo-like examples). | ||||
* | Doc | Aaron Kennedy | 2010-03-23 | 1 | -1/+1 |
| | |||||
* | Change class prefix to from QmlXXX to QDeclarativeXXX, QmlGraphicsXXX to ↵ | Warwick Allison | 2010-02-24 | 1 | -2/+2 |
| | | | | QDeclarativeXXX. | ||||
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into ↵ | Qt Continuous Integration System | 2010-02-22 | 1 | -3/+3 |
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-qml: Replace QmlList* and QList* support with a single QmlListProperty type Rename MouseRegion -> MouseArea Update QmlChanges with animation API changes. Document the default velocity of EaseFollow Remove use of unexprted private classes. Fix compile error on Solaris Increase durations when testing Behaviors. Add cached path rounded rect painting benchmark. Remove use of direct event posting. Use QTest::keyClick() for keys. | ||||
| * | Rename MouseRegion -> MouseArea | Martin Jones | 2010-02-22 | 1 | -3/+3 |
| | | |||||
* | | Doc: these files are NOT part of the test suite of the Qt toolkit | Thiago Macieira | 2010-02-20 | 1 | -1/+1 |
|/ | |||||
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 | Jason McDonald | 2010-02-16 | 1 | -1/+1 |
|\ | |||||
| * | doc: Fixed some qdoc errors. | Martin Smith | 2010-02-16 | 1 | -1/+1 |
| | | |||||
* | | Fix broken license headers. | Jason McDonald | 2010-02-16 | 1 | -18/+18 |
|/ | | | | Reviewed-by: Trust Me | ||||
* | We use JavaScript, not ECMAScript. | Martin Jones | 2010-02-03 | 1 | -2/+2 |
| | | | | Task-number: QTBUG-7720 | ||||
* | slideswitch example fixes | Yann Bodson | 2009-11-25 | 1 | -0/+3 |
| | |||||
* | cleanup progressbar example | Yann Bodson | 2009-11-25 | 1 | -1/+1 |
| | |||||
* | toggle switch example documentation | Yann Bodson | 2009-11-23 | 1 | -0/+134 |