summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* 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-122892-53184/+145122
|\
| * Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-publicFrans Englich2009-08-1217-104/+82
| |\
| | * 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
| | * Removed call to base class mouseReleaseEvent that shouldn't happen.axis2009-08-121-1/+0
| | * 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
| | * | Fixed QtNetwork autotest build breaks for Symbian.Janne Anttila2009-08-121-1/+1
| | * | 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-111-1/+1
| | |\ \
| | * | | Fix autotest failure in qgraphicsitem.Shane Kearns2009-08-111-4/+18
| | | |/ | | |/|
| * | | Revert "QItemSelectionModel did not send selectionChanged signal when deletin...Frans Englich2009-08-112-23/+1
| | |/ | |/|
| * | Prevent unnecessary repaints when moving with zero distance in moveRect().Frans Englich2009-08-111-1/+1
| |/
| * Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-publicMiikka Heikkinen2009-08-1114-158/+133
| |\
| | * Refactor S60 related changes to QGraphicsItem / QGraphicsView.Andreas Aardal Hanssen2009-08-112-133/+44
| | * Fixed KERN-EXEC 3 crash in qdesktopwidget for S60.Janne Anttila2009-08-111-1/+0
| | * Add comparison operators also to subclassesHarald Fernengel2009-08-101-2/+32
| | * s/class/struct/Harald Fernengel2009-08-101-1/+1
| | * add operator! to QScopedPointerHarald Fernengel2009-08-102-0/+13
| | * Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-publicmread2009-08-10101-990/+1532
| | |\
| | * | moved declaration of engine to better match merge and to remove warningmread2009-08-101-1/+2
| | * | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-publicmread2009-08-073111-51420/+142391
| | |\ \
| | * | | exception -> leave conversion for pointer eventsmread2009-08-072-1/+7
| | * | | replacing assert with recovery for begin/end paint lock for exception compata...mread2009-08-071-3/+5
| | * | | check for possibility that time pointer is NULLmread2009-08-071-1/+2
| | * | | fixing memory leaks in dir iteratormread2009-08-062-8/+21
| | * | | plugin factory loader memory leak protectionmread2009-08-061-5/+8
| | * | | Leaves -> exceptionsmread2009-08-061-5/+6
| * | | | RVCT didn't like a test bool variable exported directly from QtGui,Miikka Heikkinen2009-08-111-2/+7
| | |_|/ | |/| |
| * | | Merge commit 'qt/master'Jason Barron2009-08-1014-31/+113
| |\ \ \
| | * | | Remove unused member.Jan-Arve Sæther2009-08-101-1/+0
| | * | | Whitespace cleanupJan-Arve Sæther2009-08-101-3/+3
| | * | | Fix default QWidget size on X servers with XineramaBradley T. Hughes2009-08-101-0/+7
| | * | | Link with winscw againHarald Fernengel2009-08-101-1/+1
generated by cgit v0.12 at 2024-11-15 13:18:43 (GMT)