summaryrefslogtreecommitdiffstats
path: root/src/3rdparty
Commit message (Expand)AuthorAgeFilesLines
* Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2010-04-093-2/+15
|\
| * Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ...Simon Hausmann2010-04-093-2/+15
* | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2010-04-096-7/+38
|\ \ | |/
| * Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ...Simon Hausmann2010-04-063-1/+27
| * Ensure Phonon MMF backend emits aboutToFinishGareth Stockwell2010-03-312-5/+10
| * Remove compiler warningGareth Stockwell2010-03-311-1/+1
* | Revert "Attempt at fixing Phonon build issue on Symbian."Thiago Macieira2010-04-041-18/+20
* | Attempt at fixing Phonon build issue on Symbian.Thiago Macieira2010-04-041-3/+5
* | Merge remote branch 'origin/4.7' into HEADThiago Macieira2010-04-016-20/+2695
|\ \
| * \ Merge remote branch 'origin/4.7' into 4.7Olivier Goffart2010-04-013-5/+5
| |\ \
| * \ \ Merge remote branch 'integration/qt-4.7-from-4.6' into 4.7Olivier Goffart2010-03-3111-42/+349
| |\ \ \
| * \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-03-306-20/+2695
| |\ \ \ \
| | * \ \ \ Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7David Boddie2010-03-30883-73991/+90998
| | |\ \ \ \
| | | * \ \ \ Merge remote branch 'origin/4.7' into 4.7Olivier Goffart2010-03-3096-1915/+3611
| | | |\ \ \ \
| | | * \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-03-306-19/+2695
| | | |\ \ \ \ \
| | | | * | | | | Fix a bug in greek shaping causing infinite loopsLars Knoll2010-03-262-13/+54
| | | | * | | | | Included ARM NEON optimizations from pixman in Qt.Samuel Rødal2010-03-263-0/+2641
| | | | * | | | | Merge remote branch 'origin/4.7' into 4.7Olivier Goffart2010-03-259-26/+557
| | | | |\ \ \ \ \
| | | | * | | | | | Fixes a deadlock with streaming in Phonon.unknown2010-03-251-6/+0
* | | | | | | | | | Fix Phonon compilation with a namespaced Qt.Thiago Macieira2010-04-016-0/+36
| |_|_|_|_|_|_|/ / |/| | | | | | | |
* | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-03-313-5/+5
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / |/| | | | | | | |
| * | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-03-303-5/+5
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| | * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-03-303-5/+5
| | |\ \ \ \ \ \ \ | | | |_|_|_|_|/ / | | |/| | | | | |
| | | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-03-303-5/+5
| | | |\ \ \ \ \ \ | | | | |_|/ / / / | | | |/| | | | |
| | | | * | | | | Update PLATFORM(SPARC64) to CPU(SPARC64)Thiago Macieira2010-03-291-1/+1
| | | | * | | | | Trivial fix to JavaScriptCore to fix building with MSVC 2010John Brooks2010-03-272-4/+4
| | | | | |_|/ / | | | | |/| | |
* | | | | | | | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2010-03-3111-42/+349
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | / | | |_|_|_|_|/ | |/| | | | |
| * | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-03-307-39/+305
| |\ \ \ \ \ \
| | * | | | | | Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ...Simon Hausmann2010-03-307-39/+305
| | | |_|_|/ / | | |/| | | |
| * | | | | | Added additional logging to Phonon MMF backendGareth Stockwell2010-03-304-3/+44
| |/ / / / /
* | | | | | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2010-03-3030-151/+533
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-03-291-1/+7
| |\ \ \ \ \
| | * | | | | Fixed crash in Phonon MMF backend during application shutdownGareth Stockwell2010-03-291-1/+7
| * | | | | | Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ...Simon Hausmann2010-03-295-14/+46
| * | | | | | Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ...Simon Hausmann2010-03-293-3/+14
| * | | | | | Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ...Simon Hausmann2010-03-2925-135/+468
| |/ / / / /
* | | | | | Merge remote branch 'origin/4.7' into qt-4.7-from-4.6Thiago Macieira2010-03-3096-1915/+3612
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Fix typo in phonon/symbian.Justin McPherson2010-03-301-1/+1
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-03-3096-1915/+3612
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| | * | | | Merge branch 'phonon-update' into 4.7Justin McPherson2010-03-2996-1915/+3612
| | |\ \ \ \ | | | |_|/ / | | |/| | |
| | | * | | Phonon core; compile fixes after merge.Justin McPherson2010-03-262-2/+1
| | | * | | Phonon qt7; Compile fixes after merge.Justin McPherson2010-03-265-12/+21
| | | * | | Phonon; complete integration.Justin McPherson2010-03-2512-22/+1678
| | | * | | Update Phonon CMakeLists.txt.Justin McPherson2010-03-251-1/+1
| | | * | | Update Phonon qt7 backend to 4.4.0.Justin McPherson2010-03-2510-574/+137
| | | * | | Update Phonon ds9 backend to 4.4.0.Justin McPherson2010-03-2533-996/+621
| | | * | | Update Phonon GStreamer backend to 4.4.0.Justin McPherson2010-03-2519-132/+639
| | | * | | Update Phonon core to 4.4.0Justin McPherson2010-03-2522-193/+531
| | | | |/ | | | |/|
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7Martin Jones2010-03-259-26/+557
| |\ \ \ \ | | |/ / /
| * | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.7Alexis Menard2010-03-2514-11/+205
| |\ \ \ \ | | |_|/ / | |/| | / | | | |/ | | |/|
generated by cgit v0.12 at 2024-12-25 19:09:42 (GMT)