summaryrefslogtreecommitdiffstats
path: root/src/3rdparty
Commit message (Expand)AuthorAgeFilesLines
* 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
| | * | Updated WebKit from /home/shausman/src/webkit/trunk to origin/qtwebkit-4.5 ( ...Simon Hausmann2009-06-19657-2109/+2509
| * | | Phonon::VolumeSlider: Fixed the isMuteVisiblefunctionThierry Bastian2009-06-171-1/+1
| * | | QWebPage: Don't call supportsSsl()Markus Goetz2009-06-171-2/+6
| * | | Commented out code that breaks MinGW.Friedemann Kleint2009-06-171-1/+16
| * | | Fixed MinGW compilation.Friedemann Kleint2009-06-171-1/+1
| * | | Merge license header changes from 4.5Volker Hilsheimer2009-06-161-2/+2
| |\ \ \ | | |/ /
| | * | Backported WebKit SVG revisions (r43590, r43795) from the trunkSimon Hausmann2009-06-163-2/+34
| | * | Update license headers as requested by the marketing department.Jason McDonald2009-06-161-2/+2
| * | | Updated WebKit from /home/shausman/src/webkit/trunk to origin/qtwebkit-4.6-st...Simon Hausmann2009-06-166-15/+48
| * | | Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit-4.6-snapshot-...Simon Hausmann2009-06-152798-92516/+236605
* | | | Merge commit 'qt/master-stable' into 4.6-stableJason Barron2009-06-2519-168/+1314
|\ \ \ \ | |/ / / | | | / | |_|/ |/| |
| * | Merge commit 'origin/4.5'Bjørn Erik Nilsen2009-06-121-1/+2
| |\ \ | | |/
| | * Fix compile error on TigerRichard Moe Gustavsen2009-06-101-1/+2
| * | Doc: Fixed QWebPage::forwardUnsupportedContent documentation and addedDavid Boddie2009-06-093-11/+22
| * | Merge commit 'origin/4.5'Oswald Buddenhagen2009-06-086-64/+294
| |\ \ | | |/
| | * Mac: play music from CD does not work in PhononRichard Moe Gustavsen2009-06-086-83/+313
| * | All of Qt's own code compiles with -pedantic now (but pcre and webkit don't s...David Faure2009-06-041-1/+1
| * | Merge branch '4.5'Denis Dzyubenko2009-06-022-0/+3
| |\ \ | | |/
| * | improved string operations all over the placeThierry Bastian2009-05-286-16/+13
| * | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-05-272-3/+5
| |\ \
| * \ \ Merge branch '4.5'Thiago Macieira2009-05-227-6/+70
| |\ \ \
| * \ \ \ Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-animat...Thierry Bastian2009-05-2219-98/+500
| |\ \ \ \
| | * \ \ \ Merge branch '4.5' of ../qt-45-documentationDavid Boddie2009-05-203-1/+15
| | |\ \ \ \
| | * \ \ \ \ Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-05-1911-20/+202
| | |\ \ \ \ \
| | * | | | | | Ensure that the export symbols are correct. Patch supplied by Saleem/Dallas t...Frans Englich2009-05-191-1/+5
| | * | | | | | Merge branch '4.5'Thiago Macieira2009-05-111-0/+5
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch '4.5' of git@scm.dev.troll.no:qt/qtSimon Hausmann2009-05-063-0/+747
| | |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge branch '4.5' of git@scm.dev.troll.no:qt/qtSimon Hausmann2009-04-253-2/+10
| | |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-04-2430-52/+1038
| | |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ Merge branch '4.5'Rhys Weatherley2009-04-211-18/+9
| | |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-04-175-4/+24
| | |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | Updated WebKit from /home/shausman/src/webkit/trunk to origin/qtwebkit-4.5 ( ...Simon Hausmann2009-04-1513-700/+1794
| | * | | | | | | | | | | | Merge commit 'origin/4.5'Bjoern Erik Nilsen2009-04-0712-1657/+744
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-04-025-5/+35
| | |\ \ \ \ \ \ \ \ \ \ \ \ \