summaryrefslogtreecommitdiffstats
path: root/demos
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.6'Thiago Macieira2010-01-13267-276/+276
|\
| * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-01-09267-276/+276
| |\
| | * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6Simon Hausmann2010-01-081-2/+4
| | |\
| | * | Use the lowercase/shortname.h headers for Phonon includesThiago Macieira2010-01-061-9/+9
| | * | Update copyright year to 2010Jason McDonald2010-01-06267-267/+267
* | | | Merge branch '4.6'Thiago Macieira2010-01-122-5/+12
|\ \ \ \ | |/ / /
| * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-01-072-5/+12
| |\ \ \ | | |_|/ | |/| |
| | * | Merge branch 'mmfphonon' into 4.6Gareth Stockwell2010-01-062-5/+12
| | |\ \ | | | |/ | | |/|
| | | * Mediaplayer: enqueue all entries from .ram file before starting playbackGareth Stockwell2009-12-082-5/+12
* | | | Merge branch '4.6'Thiago Macieira2010-01-081-2/+4
|\ \ \ \ | |/ / /
| * | | Fixed bug in boxes demo occuring with certain OpenGL drivers.Samuel Rødal2010-01-071-2/+4
| |/ /
* | | Merge branch '4.6'Thiago Macieira2010-01-052-110/+182
|\ \ \ | |/ /
| * | Update the scrolling code of FlickCharmBenjamin Poulain2009-12-301-110/+177
| * | Removed QtWebkit.dll from Qt.sis in Symbian buildsMiikka Heikkinen2009-12-291-0/+5
* | | Merge branch '4.6'Thiago Macieira2009-12-264-92/+91
|\ \ \ | |/ /
| * | Fix a bug in resizing the anomaly browser demo.Benjamin Poulain2009-12-181-2/+3
| * | Improve the performance of the Anomaly browser demoBenjamin Poulain2009-12-182-88/+70
| * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2009-12-171-2/+1
| |\ \
| | * | WeatherInfo now shows Oslo info upon launch instead of blank screenMiikka Heikkinen2009-12-171-2/+1
| | |/
| * | Removed the chip demo for windows CEninerider2009-12-141-2/+19
| |/
* | 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