summaryrefslogtreecommitdiffstats
path: root/src/3rdparty
Commit message (Expand)AuthorAgeFilesLines
* Added missing return statementGareth Stockwell2009-08-191-0/+1
* Started work on VideoPlayer implementationGareth Stockwell2009-08-192-6/+12
* Started work on VideoPlayer implementationGareth Stockwell2009-08-189-123/+210
* Refactored AudioPlayer and VideoPlayer to separate out common code into Abstr...Gareth Stockwell2009-08-188-1079/+730
* Merged recognizer changes with abstraction for audio / video playback.Gareth Stockwell2009-08-1811-558/+1867
|\
| * Rename mmf_videoplayer back to videoplayer, apparently the includes can beFrans Englich2009-08-173-2/+2
| * 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-178-598/+1602
| * 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-172-0/+68
* | Fixed a bug which prevented phonon from compilingGareth Stockwell2009-08-141-0/+2
|/
* Commit patch by Gareth.Frans Englich2009-08-127-123/+741
* Merge branch 'master' into topic/mmfphononFrans Englich2009-08-121768-24945/+63265
|\
| * Merge commit 'qt/master'Jason Barron2009-08-101-1/+1
| |\
| | * In a .pro file the include() function does not warn if specified fileKeith Isdale2009-08-101-1/+1
| * | Rename Q_DECLARE_SCOPED_PRIVATE back to Q_DECLARE_PRIVATEHarald Fernengel2009-08-062-2/+2
| * | Merge commit 'origin/master'Jason Barron2009-08-048-19/+37
| |\ \
| | * | Squashed commit of the topic/exceptions branch.Harald Fernengel2009-08-037-19/+35
| | * | Removed tiff libarary warning: `inline' redefined.Janne Anttila2009-07-301-0/+2
| * | | Merge commit 'qt/master-stable'Jason Barron2009-08-041396-19614/+41283
| |\ \ \ | | | |/ | | |/|
| | * | Fixed warnings on phonon/ds9 with mingw (gcc 4)Thierry Bastian2009-08-039-23/+28
| | * | Doc: there is no group of explicitly shared classes, only one class uses this.Volker Hilsheimer2009-07-301-4/+11
| | * | compile on QNXHarald Fernengel2009-07-291-1/+2
| | * | Doc: fix links to the examplesVolker Hilsheimer2009-07-291-2/+3
| | * | Port of Qt to QNXHarald Fernengel2009-07-294-2/+53
| | * | Port of Qt to VxWorksRobert Griebl2009-07-2910-7/+186
| | * | Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit-4.6-snapshot-...Simon Hausmann2009-07-291377-19577/+41002
| * | | Merge commit 'qt/master-stable'Jason Barron2009-07-292-1/+3
| |\ \ \ | | |/ /
| | * | "enabled" parameter should default to true, as with QGraphicsView andVolker Hilsheimer2009-07-272-1/+3
| * | | Merge commit 'qt/master-stable'Jason Barron2009-07-27931-6162/+22797
| |\ \ \ | | |/ / | | | / | | |/ | |/|
| | * Doc: Fixed qdoc warningsDavid Boddie2009-07-231-1/+1
| | * Doc: Updated link and a bit more documentation forVolker Hilsheimer2009-07-212-10/+26
| | * Doc: fix formatting of lists.Volker Hilsheimer2009-07-201-12/+17
| | * Doc: A few cleanups, fixes and improvements.Volker Hilsheimer2009-07-191-1/+1
| | * Doc: add \since 4.6 for new APIsVolker Hilsheimer2009-07-191-0/+2
| | * Fixed another memory leak in Phonon on windowsThierry Bastian2009-07-171-3/+1
| | * Documentation and whitespace fixes in phononDavid Faure2009-07-165-51/+46
| | * Phonon: fixed a big memory leak on WindowsThierry Bastian2009-07-162-2/+4
| | * Fix warnings for mingwThierry Bastian2009-07-161-1/+1
| | * remove lots of warnings with mingwThierry Bastian2009-07-151-1/+1
| | * Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit-4.6-snapshot-...Simon Hausmann2009-07-13902-5881/+22556
| | * Removed two generated files.Simon Hausmann2009-07-132-43/+0
| | * Merge commit 'origin/4.5'Oswald Buddenhagen2009-07-137-8/+60
| | |\
| | | * Updated WebKit from /home/shausman/src/webkit/trunk to origin/qtwebkit-4.5 ( ...Simon Hausmann2009-07-1318-2040/+3375
| | * | Phonon videos on windows would not show with video acceleration disabledThierry Bastian2009-07-101-1/+1
| | * | Phonon: Fixed a possible race conditionThierry Bastian2009-07-081-7/+13
| | * | Phonon: Fixed a possible race conditionThierry Bastian2009-07-081-1/+1
| | * | Phonon: take advantage of more modern compiler to initialize structThierry Bastian2009-07-064-80/+27
| | * | Phonon: Some work done on binary sizeThierry Bastian2009-07-0613-105/+88