summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Started work on VideoPlayer implementationGareth Stockwell2009-08-192-6/+12
* Started work on VideoPlayer implementationGareth Stockwell2009-08-1810-123/+214
* Refactored AudioPlayer and VideoPlayer to separate out common code into Abstr...Gareth Stockwell2009-08-189-1092/+745
* Merged recognizer changes with abstraction for audio / video playback.Gareth Stockwell2009-08-1812-572/+1886
|\
| * Rename mmf_videoplayer back to videoplayer, apparently the includes can beFrans Englich2009-08-174-4/+4
| * More delegation, basic plumbing.Frans Englich2009-08-177-22/+41
| * Delegate from MediaObject.Frans Englich2009-08-173-1/+41
| * Refactor the media object such that we can do both video and sound.Frans Englich2009-08-179-609/+1618
| * Pushing compile fix from Gareth, modified by me.Frans Englich2009-08-141-3/+5
* | Added recognizer code to determine if file is audio or videoGareth Stockwell2009-08-173-0/+71
* | Fixed a bug which prevented phonon from compilingGareth Stockwell2009-08-141-0/+2
|/
* Commit patch by Gareth.Frans Englich2009-08-129-130/+765
* Merge branch 'master' into topic/mmfphononFrans Englich2009-08-124505-263970/+200259
|\
| * Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-publicFrans Englich2009-08-1241-131/+162
| |\
| | * Removed a couple of tests for Symbian from gui category; these don'tMiikka Heikkinen2009-08-121-2/+2
| | * Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-publicJanne Anttila2009-08-129-74/+17
| | |\
| | | * Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-publicShane Kearns2009-08-1240-125/+116
| | | |\
| | | | * Removed qdirectpainter test from Symbian tests, as it isMiikka Heikkinen2009-08-121-1/+1
| | | | * Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-publicMiikka Heikkinen2009-08-127-71/+7
| | | | |\
| | | | | * Revert "Fix to QtNetwork ARMV5 UDEB compilation"Jason Barron2009-08-124-55/+2
| | | | | * Revert '80dba8b8': Fixing default constructor problem with RVCT.Jason Barron2009-08-123-16/+5
| | | | * | Fixed qfileinfo autotest for SymbianMiikka Heikkinen2009-08-121-1/+6
| | | | |/
| | | * | only skip the QFileInfo permissions test when building for symbian OSShane Kearns2009-08-121-1/+3
| | * | | Recompiled configure.exeJanne Anttila2009-08-121-0/+0
| | | |/ | | |/|
| | * | Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-publicJanne Anttila2009-08-128-19/+49
| | |\ \
| | | * \ Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-publicMiikka Heikkinen2009-08-121-1/+0
| | | |\ \
| | | | * | Removed call to base class mouseReleaseEvent that shouldn't happen.axis2009-08-121-1/+0
| | | * | | Fixed qimagereader test compilationMiikka Heikkinen2009-08-122-1/+5
| | | |/ /
| | | * | Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-publicMiikka Heikkinen2009-08-123-8/+37
| | | |\ \
| | | | * \ Merge branch 'qlinecontrolFixes'axis2009-08-123-8/+37
| | | | |\ \
| | | | | * | Fixed warning.axis2009-08-121-1/+1
| | | | | * | Redid 7b95b70bc307 for QLineControl.axis2009-08-121-5/+34
| | | | | * | Redid patch that was lost during merge with 4.6.axis2009-08-121-1/+1
| | | | | * | Revert "Changed the behavior of ImCursorPosition slightly."axis2009-08-121-1/+1
| | | * | | | Skipped setEnvironment test in qprocess test for SymbianMiikka Heikkinen2009-08-121-4/+4
| | | |/ / /
| | | * | | Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-publicMiikka Heikkinen2009-08-124-5/+5
| | | |\ \ \
| | | * | | | Fixed SRCDIR usage in qscriptengine test for SymbianMiikka Heikkinen2009-08-122-5/+7
| | * | | | | Fixed QtGui autotest build breaks due to incorrect SRCDIR usage.Janne Anttila2009-08-125-3/+11
| | * | | | | Updated QtGui.txt autotest category file.Janne Anttila2009-08-121-2/+0
| | * | | | | Workaround for Nokia X86 compiler, to compile get more GUI test compile.Janne Anttila2009-08-123-3/+3
| | | |/ / / | | |/| | |
| | * | | | Fixed QtNetwork autotest build breaks for Symbian.Janne Anttila2009-08-124-5/+5
| | |/ / /
| | * | | Fixed qdom autotest build break due to incorrect SRCDIR usage in Symbian.Janne Anttila2009-08-122-1/+5
| | * | | Fixed QtScript autotest build breaks due to incorrect SRCDIR usage.Janne Anttila2009-08-125-2/+14
| | * | | Updated QtScript.txt autotest category file to reflect current test set.Janne Anttila2009-08-121-1/+0
| | * | | Fixed failure to build tests due to missing qkeyevent.Rohan McGovern2009-08-121-1/+0
| | * | | Doc improvement made by David Boddie.Alessandro Portale2009-08-111-3/+3
| | * | | Docs: Mentioning that Symbian has a default font size of 7 pointsAlessandro Portale2009-08-111-1/+3
| | * | | Cleaned public Api of QS60Style due to review by Volker Hilsheimer.Alessandro Portale2009-08-114-19/+17
| | | |/ | | |/|
| | * | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-publicShane Kearns2009-08-116-13/+18
| | |\ \
| | * | | Fix autotest failure in qgraphicsitem.Shane Kearns2009-08-112-4/+42
| | | |/ | | |/|