Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ... | Qt Continuous Integration System | 2010-03-01 | 2 | -1/+3 |
|\ | |||||
| * | Interview Demo: Fix warning about pixmap leak on X11. | Friedemann Kleint | 2010-03-01 | 2 | -1/+3 |
* | | Fix minehunt demo | Alan Alpert | 2010-03-01 | 2 | -7/+11 |
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml | Alan Alpert | 2010-03-01 | 10 | -80/+72 |
|\ \ | |/ | |||||
| * | Fix position of image in detail view in flickr-mobile | Yann Bodson | 2010-03-01 | 1 | -4/+1 |
| * | Set correct transformOrigin. | Martin Jones | 2010-03-01 | 1 | -0/+1 |
| * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into master-integra... | Qt Continuous Integration System | 2010-03-01 | 1 | -3/+1 |
| |\ | |||||
| | * | Fix position of image in detail view. | Martin Jones | 2010-03-01 | 1 | -3/+1 |
| * | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public into master-... | Qt Continuous Integration System | 2010-02-26 | 1 | -14/+0 |
| |\ \ | | |/ | |/| | |||||
| | * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into master-s60 | axis | 2010-02-26 | 1 | -14/+0 |
| | |\ | |||||
| | | * | Improvements to itemview keypad navigation in S60. | Janne Anttila | 2010-02-25 | 1 | -14/+0 |
| * | | | Change Connection syntax as per QT-2822. | Warwick Allison | 2010-02-26 | 3 | -9/+9 |
| * | | | Test, demo, and work-around bug QTBUG-8535 | Warwick Allison | 2010-02-26 | 2 | -18/+28 |
| * | | | Renamed Flickable viewportXXX properties contentXXX | Martin Jones | 2010-02-26 | 5 | -30/+30 |
* | | | | Make Minehunt demo compile. | Alan Alpert | 2010-03-01 | 1 | -13/+17 |
|/ / / | |||||
* | | | Recfactor in declarative snake demo | Leonardo Sobral Cunha | 2010-02-25 | 1 | -2/+2 |
* | | | Merge branch 'master' of ../../qt/master | Justin McPherson | 2010-02-24 | 2 | -1/+13 |
|\ \ \ | |/ / | |||||
| * | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into... | Qt Continuous Integration System | 2010-02-23 | 2 | -1/+13 |
| |\ \ | |||||
| | * | | Player demo updated with more user-friendly previous button behaviour. | Nicholas Young | 2010-02-23 | 2 | -1/+13 |
* | | | | Change class prefix to from QmlXXX to QDeclarativeXXX, QmlGraphicsXXX to QDec... | Warwick Allison | 2010-02-24 | 1 | -8/+8 |
* | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml | Warwick Allison | 2010-02-23 | 18 | -29/+27 |
|\ \ \ \ | |||||
| * | | | | Updates all qml examples/demos to use the easing curve value type syntax | Leonardo Sobral Cunha | 2010-02-23 | 17 | -26/+26 |
| * | | | | Remove QmlView::execute(). QmlView::setSource() does it all now. | Martin Jones | 2010-02-23 | 1 | -3/+1 |
| |/ / / | |||||
* | | | | Remove QML_DEFINE_... macros, now use QML_REGISTER_... macros calls. | Warwick Allison | 2010-02-23 | 1 | -1/+2 |
|/ / / | |||||
* | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into master-integra... | Qt Continuous Integration System | 2010-02-22 | 18 | -23/+23 |
|\ \ \ | |/ / |/| | | |||||
| * | | Rename MouseRegion -> MouseArea | Martin Jones | 2010-02-22 | 18 | -23/+23 |
* | | | Merge remote branch 'origin/master' into qt-master-from-4.6 | Thiago Macieira | 2010-02-20 | 36 | -46/+1280 |
|\ \ \ | |/ / | |||||
| * | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into master-integra... | Qt Continuous Integration System | 2010-02-19 | 24 | -46/+59 |
| |\ \ | |||||
| | * \ | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt | Martin Jones | 2010-02-18 | 1 | -1/+1 |
| | |\ \ | |||||
| | * \ \ | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml | Martin Jones | 2010-02-18 | 20 | -29/+29 |
| | |\ \ \ | |||||
| | | * | | | Fix example after introduction of RotationAnimation. | Michael Brasser | 2010-02-18 | 2 | -2/+2 |
| | | * | | | Get rid of the matchProperties/properties distinction, as it | Michael Brasser | 2010-02-18 | 18 | -27/+27 |
| | * | | | | QmlView API review. See QmlChanges.txt for details. | Martin Jones | 2010-02-18 | 2 | -11/+8 |
| | |/ / / | |||||
| | * | | | Fix palette on the N900 | Harald Fernengel | 2010-02-16 | 1 | -1/+1 |
| | * | | | Fix SameGame high scores | Alan Alpert | 2010-02-15 | 1 | -2/+3 |
| | * | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml | Alan Alpert | 2010-02-15 | 3 | -6/+13 |
| | |\ \ \ | |||||
| | * | | | | Enhance samegame high score dialog | Alan Alpert | 2010-02-15 | 3 | -3/+18 |
| * | | | | | Change namespace; QtMedia -> QtMultimedia | Justin McPherson | 2010-02-19 | 1 | -4/+4 |
| * | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-team into ma... | Qt Continuous Integration System | 2010-02-18 | 12 | -0/+1221 |
| |\ \ \ \ \ | | |_|_|/ / | |/| | | | | |||||
| | * | | | | Merge branch 'master' of ../../qt/master | Justin McPherson | 2010-02-14 | 151 | -6/+4900 |
| | |\ \ \ \ | | | | |/ / | | | |/| | | |||||
| | * | | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt | Justin McPherson | 2010-02-05 | 3 | -2/+13 |
| | |\ \ \ \ | |||||
| | * \ \ \ \ | Merge ../../qt/master | Justin McPherson | 2010-01-29 | 5 | -5/+156 |
| | |\ \ \ \ \ | |||||
| | * | | | | | | Multimedia; Add player demo. | Justin McPherson | 2010-01-18 | 10 | -0/+1215 |
| | * | | | | | | Move QtMobility multimedia framework into Qt. | Justin McPherson | 2010-01-15 | 2 | -0/+6 |
* | | | | | | | | Merge remote branch 'origin/master' into qt-master-from-4.6 | Thiago Macieira | 2010-02-18 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | |||||
| * | | | | | | | Fix copyright year. | Jason McDonald | 2010-02-16 | 1 | -1/+1 |
| | |_|_|/ / / | |/| | | | | | |||||
* | | | | | | | Merge branch '4.6' into qt-master-from-4.6 | Thiago Macieira | 2010-02-17 | 2 | -10/+38 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | / | | |_|_|_|/ | |/| | | | | |||||
| * | | | | | Update the composition demo at 60 FPS instead of at painting rate | Benjamin Poulain | 2010-02-15 | 2 | -10/+38 |
* | | | | | | Merge remote branch 'origin/master' into qt-master-from-4.6 | Thiago Macieira | 2010-02-13 | 147 | -0/+4885 |
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | | |||||
| * | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into master-integra... | Qt Continuous Integration System | 2010-02-10 | 147 | -0/+4885 |
| |\ \ \ \ \ |