summaryrefslogtreecommitdiffstats
path: root/src/3rdparty
Commit message (Expand)AuthorAgeFilesLines
* Merge remote branch 'origin/master' into bearermanagement/integrationAaron McCarthy2010-02-1116-197/+756
|\
| * Merge remote branch 'qt/4.6' into qt-master-from-4.6Qt Continuous Integration System2010-02-099-59/+218
| |\
| * \ Merge remote branch 'origin/4.6' into qt-master-from-4.6Olivier Goffart2010-02-048-14/+55
| |\ \
| * \ \ Merge remote branch 'origin/4.6' into qt-master-from-4.6Thiago Macieira2010-02-0217-70/+363
| |\ \ \
| * \ \ \ Merge remote branch 'qt/4.6' into qt-master-from-4.6Qt Continuous Integration System2010-02-017-15/+54
| |\ \ \ \
| * \ \ \ \ Merge commit 'oslo1/master' into oslo1-masterRohan McGovern2010-02-012-2/+2
| |\ \ \ \ \
| | * | | | | build fix for phonon on winceThierry Bastian2010-01-252-2/+2
| | * | | | | Merge branch '4.6'Thiago Macieira2010-01-219-24/+70
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge branch '4.6'Thiago Macieira2010-01-1814-14/+52
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch '4.6'Thiago Macieira2010-01-1342-242/+1614
| | |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge branch '4.6'Thiago Macieira2010-01-1229-501/+837
| | |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge branch '4.6'Thiago Macieira2010-01-087-9/+54
| | |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ Merge branch '4.6'Thiago Macieira2010-01-0514-24/+1618
| | |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ Merge branch '4.6'Thiago Macieira2009-12-2611-29/+142
| | |\ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ Merge branch '4.6'Thiago Macieira2009-12-0227-30/+331
| | |\ \ \ \ \ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ \ \ \ \ Merge commit 'origin/4.6' into oslo1-masterRohan McGovern2010-02-0198-779/+4648
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | Merge branch '4.6'Thiago Macieira2009-11-25114-2084/+4426
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Sync with latest clucene source. Fixes at least two crash bugs.kh12009-11-166-66/+111
| * | | | | | | | | | | | | | | Phonon: cleanup for mingw 3.X ifdefsThierry Bastian2009-11-162-15/+0
| * | | | | | | | | | | | | | | Phonon: make EVR also the default for mingw and fix build with winceThierry Bastian2009-11-168-384/+638
| * | | | | | | | | | | | | | | Add EVR to the Phonon DirectShow9 (ds9) backend as the default.APTX2009-11-163-4/+279
* | | | | | | | | | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-02-103-1/+18
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Fix the WebKit buildSimon Hausmann2010-02-101-1/+1
| * | | | | | | | | | | | | | | | Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ...Simon Hausmann2010-02-103-1/+18
* | | | | | | | | | | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-02-101-17/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | License update as requested by legal for file relicensed from S60.Janne Anttila2010-02-101-17/+0
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ...Simon Hausmann2010-02-103-3/+17
|/ / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-02-066-28/+81
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ...Simon Hausmann2010-02-056-28/+81
* | | | | | | | | | | | | | | | Merge remote branch 'origin/4.6' into 4.6Paul Olav Tvete2010-02-051-31/+22
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-02-051-31/+22
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | I10n: Use 'real' Linguist comments in Phonon::EnvironmentalReverbFriedemann Kleint2010-02-041-31/+22
| | | |_|_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-02-051-0/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Merge remote branch 'staging/4.6' into 4.6Samuel Rødal2010-02-041-0/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-02-031-0/+3
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-02-031-0/+3
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-02-021-0/+3
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|/ | | | | |/| | | | | | | | | | | | |
| | | | | * | | | | | | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-02-011-0/+3
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | * | | | | | | | | | | | | fix crash in Phonon::DS9 backendJoerg Bornemann2010-02-011-0/+3
| | | | | | | |_|_|_|_|_|_|_|_|_|_|/ | | | | | | |/| | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Initial support for S60 softkey icons.Janne Anttila2010-02-041-0/+112
|/ / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-02-032-2/+22
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Added descriptions of translatable strings for Phonon MMF reverb effectGareth Stockwell2010-02-031-1/+21
| * | | | | | | | | | | | | | | | Corrected namespace for Phonon::MMF translatable error stringsGareth Stockwell2010-02-031-1/+1
| |/ / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into 4.6-int...Qt Continuous Integration System2010-02-031-0/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into 4.6ck2010-02-028-12/+181
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | Webkit: Fix missing namespace.ck2010-02-021-0/+2
| | |/ / / / / / / / / / / / / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ...Simon Hausmann2010-02-024-11/+30
* | | | | | | | | | | | | | | Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ...Simon Hausmann2010-02-022-2/+2
| |/ / / / / / / / / / / / / |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ...Simon Hausmann2010-02-018-12/+181
|/ / / / / / / / / / / / /
* | | | | | | | | | | | | Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ...Simon Hausmann2010-01-2913-59/+183
|/ / / / / / / / / / / /