summaryrefslogtreecommitdiffstats
path: root/src/3rdparty
Commit message (Expand)AuthorAgeFilesLines
* 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
| * | src/3rdparty/phonon: Remove QT_WA and non-Unicode code paths, dropping Win9x ...miniak2009-07-011-4/+1
* | | Merge commit 'origin/master' into 4.6-mergedJason Barron2009-07-093-4/+4
|\ \ \
| * \ \ Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtaxis2009-06-29669-2201/+2936
| |\ \ \ | | | |/ | | |/|
| * | | Remove some warnings in harfbuzz component.axis2009-06-293-4/+4
* | | | Merge commit 'qt/master-stable' into 4.6-mergedJason Barron2009-06-302977-162187/+332146
|\ \ \ \ | | |_|/ | |/| |
| * | | Re-apply change bd7c123dc88908f41e6c0eccb9b03f9684e5ca27 by Thiago MacieiraThiago Macieira2009-06-293-11/+9
| * | | Re-apply change 353dcfd307853da289fdd245410e2e07358624a0 by Friedemann KleintFriedemann Kleint2009-06-291-1/+16
| * | | Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit-4.6-snapshot-...Simon Hausmann2009-06-29232-1619/+6414
| * | | Silenced a warning caused by (apparently) a gcc 4.3 bug:Thiago Macieira2009-06-263-11/+9
| * | | Merge branch '4.5'Thiago Macieira2009-06-261-0/+9
| |\ \ \ | | | |/ | | |/|
| | * | Updated WebKit from /home/shausman/src/webkit/trunk to origin/qtwebkit-4.5 ( ...Simon Hausmann2009-06-253-1/+24
| * | | Re-apply change 89e6d626f1e23858735659a1596408cd7a521c02 by Friedemann KleintFriedemann Kleint2009-06-241-1/+16
| * | | Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit-4.6-snapshot-...Simon Hausmann2009-06-241034-144651/+165637
| * | | Merge branch '4.5' of scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-06-231-5/+4
| |\ \ \ | | |/ /
| | * | Updated WebKit from /home/shausman/src/webkit/trunk to origin/qtwebkit-4.5 ( ...Simon Hausmann2009-06-234-6/+52
| * | | Merge commit 'origin/4.5'Oswald Buddenhagen2009-06-231-1/+4
| |\ \ \ | | |/ /
| | * | Fix compilation after the last change.Thiago Macieira2009-06-231-1/+4