summaryrefslogtreecommitdiffstats
path: root/demos
Commit message (Expand)AuthorAgeFilesLines
* Added playlist playback modes combo box to player demoDmytro Poplavskiy2010-03-042-1/+30
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-03-012-1/+3
|\
| * Interview Demo: Fix warning about pixmap leak on X11.Friedemann Kleint2010-03-012-1/+3
* | Fix minehunt demoAlan Alpert2010-03-012-7/+11
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlAlan Alpert2010-03-0110-80/+72
|\ \ | |/
| * Fix position of image in detail view in flickr-mobileYann Bodson2010-03-011-4/+1
| * Set correct transformOrigin.Martin Jones2010-03-011-0/+1
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into master-integra...Qt Continuous Integration System2010-03-011-3/+1
| |\
| | * Fix position of image in detail view.Martin Jones2010-03-011-3/+1
| * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public into master-...Qt Continuous Integration System2010-02-261-14/+0
| |\ \ | | |/ | |/|
| | * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into master-s60axis2010-02-261-14/+0
| | |\
| | | * Improvements to itemview keypad navigation in S60.Janne Anttila2010-02-251-14/+0
| * | | Change Connection syntax as per QT-2822.Warwick Allison2010-02-263-9/+9
| * | | Test, demo, and work-around bug QTBUG-8535Warwick Allison2010-02-262-18/+28
| * | | Renamed Flickable viewportXXX properties contentXXXMartin Jones2010-02-265-30/+30
* | | | Make Minehunt demo compile.Alan Alpert2010-03-011-13/+17
|/ / /
* | | Recfactor in declarative snake demoLeonardo Sobral Cunha2010-02-251-2/+2
* | | Merge branch 'master' of ../../qt/masterJustin McPherson2010-02-242-1/+13
|\ \ \ | |/ /
| * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into...Qt Continuous Integration System2010-02-232-1/+13
| |\ \
| | * | Player demo updated with more user-friendly previous button behaviour.Nicholas Young2010-02-232-1/+13
* | | | Change class prefix to from QmlXXX to QDeclarativeXXX, QmlGraphicsXXX to QDec...Warwick Allison2010-02-241-8/+8
* | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlWarwick Allison2010-02-2318-29/+27
|\ \ \ \
| * | | | Updates all qml examples/demos to use the easing curve value type syntaxLeonardo Sobral Cunha2010-02-2317-26/+26
| * | | | Remove QmlView::execute(). QmlView::setSource() does it all now.Martin Jones2010-02-231-3/+1
| |/ / /
* | | | Remove QML_DEFINE_... macros, now use QML_REGISTER_... macros calls.Warwick Allison2010-02-231-1/+2
|/ / /
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into master-integra...Qt Continuous Integration System2010-02-2218-23/+23
|\ \ \ | |/ / |/| |
| * | Rename MouseRegion -> MouseAreaMartin Jones2010-02-2218-23/+23
* | | Merge remote branch 'origin/master' into qt-master-from-4.6Thiago Macieira2010-02-2036-46/+1280
|\ \ \ | |/ /
| * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into master-integra...Qt Continuous Integration System2010-02-1924-46/+59
| |\ \
| | * \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qtMartin Jones2010-02-181-1/+1
| | |\ \
| | * \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlMartin Jones2010-02-1820-29/+29
| | |\ \ \
| | | * | | Fix example after introduction of RotationAnimation.Michael Brasser2010-02-182-2/+2
| | | * | | Get rid of the matchProperties/properties distinction, as itMichael Brasser2010-02-1818-27/+27
| | * | | | QmlView API review. See QmlChanges.txt for details.Martin Jones2010-02-182-11/+8
| | |/ / /
| | * | | Fix palette on the N900Harald Fernengel2010-02-161-1/+1
| | * | | Fix SameGame high scoresAlan Alpert2010-02-151-2/+3
| | * | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlAlan Alpert2010-02-153-6/+13
| | |\ \ \
| | * | | | Enhance samegame high score dialogAlan Alpert2010-02-153-3/+18
| * | | | | Change namespace; QtMedia -> QtMultimediaJustin McPherson2010-02-191-4/+4
| * | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-team into ma...Qt Continuous Integration System2010-02-1812-0/+1221
| |\ \ \ \ \ | | |_|_|/ / | |/| | | |
| | * | | | Merge branch 'master' of ../../qt/masterJustin McPherson2010-02-14151-6/+4900
| | |\ \ \ \ | | | | |/ / | | | |/| |
| | * | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtJustin McPherson2010-02-053-2/+13
| | |\ \ \ \
| | * \ \ \ \ Merge ../../qt/masterJustin McPherson2010-01-295-5/+156
| | |\ \ \ \ \
| | * | | | | | Multimedia; Add player demo.Justin McPherson2010-01-1810-0/+1215
| | * | | | | | Move QtMobility multimedia framework into Qt.Justin McPherson2010-01-152-0/+6
* | | | | | | | Merge remote branch 'origin/master' into qt-master-from-4.6Thiago Macieira2010-02-181-1/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Fix copyright year.Jason McDonald2010-02-161-1/+1
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge branch '4.6' into qt-master-from-4.6Thiago Macieira2010-02-172-10/+38
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | / | | |_|_|_|/ | |/| | | |
| * | | | | Update the composition demo at 60 FPS instead of at painting rateBenjamin Poulain2010-02-152-10/+38
* | | | | | Merge remote branch 'origin/master' into qt-master-from-4.6Thiago Macieira2010-02-13147-0/+4885
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |