summaryrefslogtreecommitdiffstats
path: root/demos
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.6'Thiago Macieira2009-12-023-261/+345
|\
| * Adjust qmediaplayer's settings dialog for small screens.Frans Englich2009-11-251-160/+191
| * Merge commit 's60/4.6' into mmfphononFrans Englich2009-11-231-0/+1
| |\
| * \ Merge branch '4.6' into mmfphononFrans Englich2009-11-2031-228/+260
| |\ \
| * | | Added additional keyboard shortcuts to MediaPlayerGareth Stockwell2009-11-191-8/+17
| * | | Added 'fullscreen video' menu option to media playerGareth Stockwell2009-11-192-90/+128
| * | | Mediaplayer: do not exit full-screen when pausedGareth Stockwell2009-11-191-4/+4
| * | | qmediaplayer: pausing behavior for dialog inconvenient.Frans Englich2009-11-162-12/+18
* | | | Merge branch '4.6'Thiago Macieira2009-11-2532-231/+285
|\ \ \ \ | | |_|/ | |/| |
| * | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-st...axis2009-11-233-0/+51
| |\ \ \ | | | |/ | | |/|
| | * | Add support for opening Real Media RAM files.Frans Englich2009-11-202-0/+49
| | * | Symbian: Add capability NetworkServices.Frans Englich2009-11-201-0/+2
| * | | Merge commit 'd9fa92' into origin-4.6Olivier Goffart2009-11-202-9/+35
| |\ \ \ | | |/ /
| | * | Enabled Qt icon in Symbian also for demos/examples without UID3.Janne Anttila2009-11-191-1/+1
| | * | Added default Qt icon back for Qt demos/examples in Symbian.Janne Anttila2009-11-192-9/+35
| * | | Simply adds the Frozen Column example to qtDemoPierre Rossi2009-11-191-0/+1
| |/ /
| * | Ran the script utils/normalizeOlivier Goffart2009-11-1822-173/+173
| * | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-st...axis2009-11-181-1/+1
| |\ \
| | * | Removed Browser demo from Symbian buildsMiikka Heikkinen2009-11-181-1/+1
| * | | Merge upstream/4.6 into oslo-staging-2Olivier Goffart2009-11-172-43/+1
| |\ \ \ | | |/ / | |/| |
| | * | Merge oslo-staging-2/4.6 into upstream/4.6Olivier Goffart2009-11-173-1/+23
| | |\ \
| | * \ \ Merge commit 'upstream/4.6' into 4.6Bradley T. Hughes2009-11-134-3/+14
| | |\ \ \
| | * \ \ \ Merge commit 'upstream/4.6' into 4.6Bradley T. Hughes2009-11-121-1/+1
| | |\ \ \ \
| | * | | | | QUrl::fromUserInput: improvements, corrections and make the demoJocelyn Turcotte2009-11-122-43/+1
| * | | | | | Removed drilldown from fluidlauncher demo.axis2009-11-173-4/+0
| | |_|_|/ / | |/| | | |
| * | | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-st...axis2009-11-162-1/+22
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| | * | | | Merge commit 's60/4.6' into mmfphononFrans Englich2009-11-166-5/+16
| | |\ \ \ \ | | | | |_|/ | | | |/| |
| | * | | | Merge branch '4.6' into mmfphononFrans Englich2009-11-162-17/+19
| | |\ \ \ \
| | * | | | | Pause playback on small screens when popping up dialogs.Frans Englich2009-11-122-0/+21
| | * | | | | Mediaplayer now pauses playback before displaying error dialogGareth Stockwell2009-11-091-1/+1
| * | | | | | Properly initialize all vars.Thomas Zander2009-11-161-0/+1
| | |_|/ / / | |/| | | |
* | | | | | Remove mingw specific ifdefs after upgrade to mingw-gcc 4.4Thierry Bastian2009-11-171-2/+0
|/ / / / /
* | | | | Merge oslo-staging-2/4.6 into upstream/4.6Olivier Goffart2009-11-134-3/+14
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Fixes sub-attaq segfault when pausingLeonardo Sobral Cunha2009-11-102-0/+10
| * | | | Fixes sub-attaq demo, unfreeze boat after launching new game when on pauseLeonardo Sobral Cunha2009-11-102-3/+4
| | |_|/ | |/| |
* | | | Doc: Fixed typo.David Boddie2009-11-091-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
* | | 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
| |/ |/|
* | 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