summaryrefslogtreecommitdiffstats
path: root/src/3rdparty
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declar...Michael Brasser2009-06-242-6/+8
|\
| * 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
* | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declar...Aaron Kennedy2009-06-192800-92498/+236640
|\ \ \ | |/ /
| * | 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 'origin/4.5'Bjørn Erik Nilsen2009-06-121-1/+2
| |\ \ | | |/
| | * Fix compile error on TigerRichard Moe Gustavsen2009-06-101-1/+2
* | | Merge commit 'qt/master' into kinetic-declarativeuiBjørn Erik Nilsen2009-06-103-11/+22
|\ \ \ | |/ /
| * | Doc: Fixed QWebPage::forwardUnsupportedContent documentation and addedDavid Boddie2009-06-093-11/+22
* | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declar...Michael Brasser2009-06-097-65/+295
|\ \ \ | |/ /
| * | 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 commit 'mainline/master' into kinetic-declarativeuiBjørn Erik Nilsen2009-06-042-0/+3
|\ \ \ | |/ /
| * | Merge branch '4.5'Denis Dzyubenko2009-06-022-0/+3
| |\ \ | | |/
| | * Fixed aspect ratio on WindowsThierry Bastian2009-06-022-0/+3
* | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declar...Michael Brasser2009-05-296-16/+13
|\ \ \ | |/ /
| * | improved string operations all over the placeThierry Bastian2009-05-286-16/+13
* | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declar...Michael Brasser2009-05-2710-9/+76
|\ \ \ | |/ /
| * | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-05-272-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'Thiago Macieira2009-05-227-6/+70
| |\ \ | | |/
| | * Updated WebKit from /home/ariya/dev/webkit/qtwebkit-4.5 to origin/qtwebkit-4....Ariya Hidayat2009-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
| |\ \
| * | | 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
| |\ \ \
| * \ \ \ 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
| / / / /
* | | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declar...Michael Brasser2009-05-2213-21/+221
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Merge branch '4.5' of ../qt-45-documentationDavid Boddie2009-05-203-1/+15
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | 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
| * | | | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-05-1911-20/+202
| |\ \ \ \ | | |/ / /
| | * | | Updated WebKit from /home/ariya/dev/webkit/qtwebkit-4.5 to origin/qtwebkit-4....Ariya Hidayat2009-05-193-11/+41
| | * | | Updated WebKit from /home/ariya/dev/webkit/qtwebkit-4.5 to origin/qtwebkit-4....Ariya Hidayat2009-05-189-10/+162
| | |/ /
| * | | Ensure that the export symbols are correct. Patch supplied by Saleem/Dallas t...Frans Englich2009-05-191-1/+5
* | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declar...Alexis Menard2009-05-121-0/+5
|\ \ \ \ | |/ / /