summaryrefslogtreecommitdiffstats
path: root/demos
Commit message (Expand)AuthorAgeFilesLines
* Merge remote branch 'qt/4.6' into kinetic-declarativeuiAndreas Aardal Hanssen2009-11-111-1/+1
|\
| * Merge branch '4.6-api-review' into 4.6Marius Storm-Olsen2009-11-091-1/+1
| |\
| | * API review: Rename functions numColors(), setNumColors() and numBytes()Marius Storm-Olsen2009-11-061-1/+1
* | | Fix minehunt demoAlan Alpert2009-11-114-2/+17
* | | Remove WebView::pagewidth and tidy up - it's not needed and interferedWarwick Allison2009-11-101-17/+26
* | | Merge branch '4.6' of git://scm.dev.nokia.troll.no/qt/qt into kinetic-declara...Warwick Allison2009-11-094-21/+23
|\ \ \ | |/ /
| * | Merge commit 'origin/4.6' into 4.6Olivier Goffart2009-11-062-17/+19
| |\ \
| | * \ Merge branch '4.6-s60' into 4.6axis2009-11-061-1/+1
| | |\ \ | | | |/ | | |/|
| | | * Merge commit 's60/4.6' into mmfphononFrans Englich2009-11-042-3/+3
| | | |\
| | | * \ Merge branch '4.6' into mmfphononGareth Stockwell2009-11-0336-28985/+1446
| | | |\ \
| | | * | | Fix build caused by merge error.Frans Englich2009-10-231-1/+0
| | | * | | Listen to hasVideoChanged() signal instead, such that we're more robust.Frans Englich2009-10-231-0/+1
| | * | | | Modify QGLShader and QGLShaderProgram in response to API reviewRhys Weatherley2009-11-051-16/+18
| | | |_|/ | | |/| |
| * | | | Result API review with JasminThierry Bastian2009-11-041-1/+1
| |/ / /
| * | | Incorporate API review feedback for math3d classes.Rhys Weatherley2009-11-042-3/+3
| | |/ | |/|
* | | Rename targets -> matchTargets and properties -> matchProperties.Michael Brasser2009-11-0617-27/+27
* | | Update semantics of targets/properties and target/property.Michael Brasser2009-11-063-3/+3
* | | fix calculatorYann Bodson2009-11-051-19/+15
* | | Use darker() and lighter() functions from global Qt object rather than from S...Yann Bodson2009-11-054-4/+4
* | | Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Alan Alpert2009-11-051-1/+1
|\ \ \
| * | | Remove "to" limit on minor version.Warwick Allison2009-11-051-1/+1
* | | | Particles cleaned up and placed in in qmlgraphics/Alan Alpert2009-11-052-11/+8
|/ / /
* | | Merge branch '4.6' of git://scm.dev.nokia.troll.no/qt/qt into kinetic-declara...Warwick Allison2009-11-0436-28985/+1446
|\ \ \ | |/ /
| * | Reducing file size.Alessandro Portale2009-10-301-0/+0
| * | Reducing file sizes.Alessandro Portale2009-10-301-0/+0
| * | Reducing file sizes.Alessandro Portale2009-10-301-0/+0
| * | Reducing file sizes.Alessandro Portale2009-10-305-0/+0
| * | Reducing file sizes.Alessandro Portale2009-10-303-0/+0
| * | Reducing file sizes.Alessandro Portale2009-10-3013-0/+0
| * | Reduced file sizes.Alessandro Portale2009-10-3012-28985/+1446
| |/
* | Fix assertion (sc not declared).Warwick Allison2009-11-021-1/+1
* | Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic int...Yann Bodson2009-10-301-1/+1
|\ \
| * \ Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Aaron Kennedy2009-10-301-0/+40
| |\ \
| * | | Rename qfx files to qmlgraphics filesAaron Kennedy2009-10-301-1/+1
* | | | make twitter not depend on flickr exampleYann Bodson2009-10-3018-20/+172
* | | | Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic int...Yann Bodson2009-10-301-0/+40
|\ \ \ \ | | |/ / | |/| |
| * | | Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Warwick Allison2009-10-303-7/+47
| |\ \ \ | | |/ /
| * | | fix headersWarwick Allison2009-10-291-0/+40
* | | | fix twitter exampleYann Bodson2009-10-302-3/+3
| |/ / |/| |
* | | Add local highscores to SameGameAlan Alpert2009-10-293-7/+47
|/ /
* | Remove QML SQL classesAaron Kennedy2009-10-2815-857/+0
* | Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic int...Yann Bodson2009-10-281-1/+1
|\ \
| * | "Compile"Aaron Kennedy2009-10-281-1/+1
* | | cleanupYann Bodson2009-10-2817-33/+33
|/ /
* | SameGame cleans up blocks now.Alan Alpert2009-10-271-0/+1
* | make remotableWarwick Allison2009-10-262-4/+4
* | Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Warwick Allison2009-10-261-0/+1
|\ \
| * | Flip around perspective originAaron Kennedy2009-10-261-0/+1
* | | Allow flickr demo to be remote.Warwick Allison2009-10-261-0/+10
|/ /
* | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declarati...Michael Brasser2009-10-257-11/+22
|\ \ | |/