Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Add subdirs .pro for examples/declarative/extending | Aaron Kennedy | 2010-02-24 | 2 | -0/+14 |
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml | Warwick Allison | 2010-02-24 | 1 | -0/+1 |
|\ | |||||
| * | Add an "asynchonous" property to Image. | Martin Jones | 2010-02-24 | 1 | -0/+1 |
* | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt | Warwick Allison | 2010-02-24 | 20 | -1/+3092 |
|\ \ | |/ |/| | |||||
| * | Merge remote branch 'origin/master' into bearermanagement/staging | Aaron McCarthy | 2010-02-23 | 71 | -114/+218 |
| |\ | |||||
| * \ | Merge remote branch 'origin/master' into bearermanagement/unit-tests | Aaron McCarthy | 2010-02-22 | 86 | -465/+706 |
| |\ \ | |||||
| * \ \ | Merge remote branch 'origin/master' into bearermanagement/unit-tests | Aaron McCarthy | 2010-02-17 | 3 | -98/+98 |
| |\ \ \ | |||||
| * \ \ \ | Merge remote branch 'origin/master' into bearermanagement/integration | Aaron McCarthy | 2010-02-14 | 324 | -1/+12534 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge remote branch 'origin/master' into bearermanagement/integration | Aaron McCarthy | 2010-02-11 | 55 | -1362/+524 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge remote branch 'origin/4.6' into bearermanagement/integration | Aaron McCarthy | 2010-02-11 | 17 | -20/+29 |
| |\ \ \ \ \ \ | |||||
| * | | | | | | | Display session statistics. | Aaron McCarthy | 2010-02-08 | 3 | -4/+69 |
| * | | | | | | | Merge commit 'origin/4.6' into bearermanagement/integration-4 | Aaron McCarthy | 2010-01-29 | 1133 | -1487/+1560 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge commit 'BearerIntegration-4' into bearermanagement/integration-4 | Aaron McCarthy | 2010-01-29 | 3 | -211/+219 |
| |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | Bearer Management Integration 4. | Aaron McCarthy | 2010-01-29 | 3 | -211/+219 |
| * | | | | | | | | | Merge branch 'bearermanagement/corewlan' into bearermanagement/integration-2 | Aaron McCarthy | 2010-01-05 | 13 | -32/+25 |
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | | | |||||
| | * | | | | | | | | Fix up license headers. | Aaron McCarthy | 2009-12-22 | 10 | -10/+10 |
| | * | | | | | | | | Make compile. | Aaron McCarthy | 2009-12-22 | 7 | -40/+14 |
| * | | | | | | | | | Bearer Management Integration 2. | Aaron McCarthy | 2010-01-04 | 5 | -28/+26 |
| |/ / / / / / / / | |||||
| * | | | | | | | | Bearer Management Integration 1. | Aaron McCarthy | 2009-12-22 | 19 | -0/+3027 |
* | | | | | | | | | Change class prefix to from QmlXXX to QDeclarativeXXX, QmlGraphicsXXX to QDec... | Warwick Allison | 2010-02-24 | 46 | -129/+129 |
* | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml | Warwick Allison | 2010-02-23 | 24 | -94/+103 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Get rid of the useless import 'files' | Roberto Raggi | 2010-02-23 | 1 | -1/+0 |
| * | | | | | | | | | Fixed the install rules for the QML plugins example. | Roberto Raggi | 2010-02-23 | 1 | -11/+14 |
| * | | | | | | | | | Added the qmldir file for declarative plugins example | Thorbjørn Lindeijer | 2010-02-23 | 1 | -0/+2 |
| * | | | | | | | | | Get rid of QmlModulePlugin. | Roberto Raggi | 2010-02-23 | 7 | -11/+16 |
| * | | | | | | | | | Updates all qml examples/demos to use the easing curve value type syntax | Leonardo Sobral Cunha | 2010-02-23 | 13 | -75/+77 |
| * | | | | | | | | | Remove QmlView::execute(). QmlView::setSource() does it all now. | Martin Jones | 2010-02-23 | 2 | -4/+2 |
| | |_|_|_|_|_|_|/ | |/| | | | | | | | |||||
* | | | | | | | | | Remove QML_DEFINE_... macros, now use QML_REGISTER_... macros calls. | Warwick Allison | 2010-02-23 | 30 | -47/+58 |
|/ / / / / / / / | |||||
* | | | | | | | | Updated based on change to transformOrign | Nigel Hietala | 2010-02-22 | 5 | -0/+5 |
* | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into master-integra... | Qt Continuous Integration System | 2010-02-22 | 66 | -114/+213 |
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | | | |||||
| * | | | | | | | Replace QmlList* and QList* support with a single QmlListProperty type | Aaron Kennedy | 2010-02-22 | 25 | -57/+156 |
| * | | | | | | | Rename MouseRegion -> MouseArea | Martin Jones | 2010-02-22 | 41 | -57/+57 |
* | | | | | | | | Merge remote branch 'origin/master' into qt-master-from-4.6 | Thiago Macieira | 2010-02-20 | 27 | -41/+177 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | |||||
| * | | | | | | | Fix dynamic example | Alan Alpert | 2010-02-19 | 1 | -0/+1 |
| * | | | | | | | More strict type checking of ListElement properties. | Warwick Allison | 2010-02-19 | 2 | -3/+3 |
| * | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt | Martin Jones | 2010-02-18 | 57 | -86/+86 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml | Martin Jones | 2010-02-18 | 20 | -37/+37 |
| |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | Get rid of the matchProperties/properties distinction, as it | Michael Brasser | 2010-02-18 | 20 | -37/+37 |
| * | | | | | | | | | QmlView API review. See QmlChanges.txt for details. | Martin Jones | 2010-02-18 | 2 | -2/+2 |
| |/ / / / / / / / | |||||
| * | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into master-integra... | Qt Continuous Integration System | 2010-02-17 | 4 | -0/+135 |
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | | | |||||
| | * | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml | Martin Jones | 2010-02-16 | 1 | -1/+2 |
| | |\ \ \ \ \ \ \ | | | | |_|_|_|_|/ | | | |/| | | | | | |||||
| | * | | | | | | | Add QmlImageProvider to allow asynchronous access to images. | Martin Jones | 2010-02-16 | 4 | -0/+135 |
* | | | | | | | | | Merge remote branch 'origin/4.6' into qt-master-from-4.6 | Thiago Macieira | 2010-02-20 | 2 | -2/+3 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Pass QAudioDeviceInfo when creating audio input/output in examples | Gareth Stockwell | 2010-02-18 | 2 | -2/+3 |
* | | | | | | | | | | Merge remote branch 'origin/master' into qt-master-from-4.6 | Thiago Macieira | 2010-02-18 | 56 | -85/+85 |
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / | |/| | | | | | | | | |||||
| * | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master... | Qt Continuous Integration System | 2010-02-16 | 56 | -85/+85 |
| |\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | | | | | | |||||
| | * | | | | | | | | Fix copyright year. | Jason McDonald | 2010-02-16 | 55 | -55/+55 |
| | * | | | | | | | | Fix broken license headers. | Jason McDonald | 2010-02-16 | 2 | -30/+30 |
| | | |_|/ / / / / | | |/| | | | | | | |||||
* | | | | | | | | | Merge branch 'qt-master-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration... | Qt Continuous Integration System | 2010-02-17 | 4 | -339/+443 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | |||||
| * | | | | | | | | Merge branch '4.6' into qt-master-from-4.6 | Thiago Macieira | 2010-02-17 | 4 | -339/+443 |
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| / / / / / / | | |/ / / / / / |