summaryrefslogtreecommitdiffstats
path: root/src/3rdparty
Commit message (Expand)AuthorAgeFilesLines
* 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
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-04-013-7/+11
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch '4.5'Thiago Macieira2009-03-275-8/+67
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-03-266-3/+54
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-03-234-50/+51
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | Long live Qt!Lars Knoll2009-03-235985-0/+2084807
| | / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | compile when using qt namespaceKent Hansen2009-05-201-0/+1
| * | | | | | | | | | | | | | | | | | Merge branch 'kinetic-statemachine' of git@scm.dev.nokia.troll.no:qt/kinetic ...Alexis Menard2009-05-121-51/+51
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | remove multiplication by 1 in easing curvesThierry Bastian2009-04-291-3/+3
| | * | | | | | | | | | | | | | | | | | Fix a bug in the ease{In,Out}Bounce easing functions + small cleanup.Jan-Arve Sæther2009-04-231-17/+17
| | * | | | | | | | | | | | | | | | | | Remove trailing whitespaceJan-Arve Sæther2009-04-231-32/+32
| | * | | | | | | | | | | | | | | | | | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-animationsAlexis Menard2009-04-1730-120/+633
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|/ / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | Initial import of kinetic-animations branch from the old kineticAlexis Menard2009-04-175987-0/+2085142
| | / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-statemachineAlexis Menard2009-05-1256-186/+2436
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|/ / / / / / | | |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Initial import of statemachine branch from the old kinetic repositoryAlexis Menard2009-04-175987-0/+2085142
| / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | Make Qt exception safer.Robert Griebl2009-06-104-3/+10
* | | | | | | | | | | | | | | | | | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtaxis2009-06-082-0/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Fixed aspect ratio on WindowsThierry Bastian2009-06-022-0/+3
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtaxis2009-06-022-3/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | Clearifying QWebFrame docsMorten Engvoldsen2009-05-261-2/+3
| * | | | | | | | | | | | | | | | Fix a crash in Phonon::EffectWidgetJens Bache-Wiig2009-05-261-1/+2
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtaxis2009-05-257-6/+70
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | Updated WebKit from /home/ariya/dev/webkit/qtwebkit-4.5 to origin/qtwebkit-4....Ariya Hidayat2009-05-227-6/+70
| | |_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtaxis2009-05-2012-20/+216
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / /
| * | | | | | | | | | | | | | Updated WebKit from /home/ariya/dev/webkit/qtwebkit-4.5 to origin/qtwebkit-4....Ariya Hidayat2009-05-193-1/+15
| * | | | | | | | | | | | | | Revert commit a372fc602a3cb09379875ced99ec969c371917d7.Ariya Hidayat2009-05-196-695/+1645
| * | | | | | | | | | | | | | Updated WebKit from /home/ariya/dev/webkit/qtwebkit-4.5 to origin/qtwebkit-4....Ariya Hidayat2009-05-196-1645/+695
| | |_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | |