Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Updated JavaScriptCore from /home/khansen/dev/qtwebkit-qtscript-integration t... | Kent Hansen | 2010-04-07 | 4 | -8/+31 |
* | Updated JavaScriptCore from /home/khansen/dev/qtwebkit-qtscript-integration t... | Kent Hansen | 2010-04-07 | 3 | -7/+44 |
* | Updated JavaScriptCore from /home/khansen/dev/qtwebkit-qtscript-integration t... | Kent Hansen | 2010-04-07 | 3 | -6/+16 |
* | Revert "Attempt at fixing Phonon build issue on Symbian." | Thiago Macieira | 2010-04-04 | 1 | -18/+20 |
* | Attempt at fixing Phonon build issue on Symbian. | Thiago Macieira | 2010-04-04 | 1 | -3/+5 |
* | Merge remote branch 'origin/4.7' into HEAD | Thiago Macieira | 2010-04-01 | 6 | -20/+2695 |
|\ | |||||
| * | Merge remote branch 'origin/4.7' into 4.7 | Olivier Goffart | 2010-04-01 | 3 | -5/+5 |
| |\ | |||||
| * \ | Merge remote branch 'integration/qt-4.7-from-4.6' into 4.7 | Olivier Goffart | 2010-03-31 | 11 | -42/+349 |
| |\ \ | |||||
| * \ \ | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ... | Qt Continuous Integration System | 2010-03-30 | 6 | -20/+2695 |
| |\ \ \ | |||||
| | * \ \ | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7 | David Boddie | 2010-03-30 | 883 | -73991/+90998 |
| | |\ \ \ | |||||
| | | * \ \ | Merge remote branch 'origin/4.7' into 4.7 | Olivier Goffart | 2010-03-30 | 96 | -1915/+3611 |
| | | |\ \ \ | |||||
| | | * \ \ \ | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ... | Qt Continuous Integration System | 2010-03-30 | 6 | -19/+2695 |
| | | |\ \ \ \ | |||||
| | | | * | | | | Fix a bug in greek shaping causing infinite loops | Lars Knoll | 2010-03-26 | 2 | -13/+54 |
| | | | * | | | | Included ARM NEON optimizations from pixman in Qt. | Samuel Rødal | 2010-03-26 | 3 | -0/+2641 |
| | | | * | | | | Merge remote branch 'origin/4.7' into 4.7 | Olivier Goffart | 2010-03-25 | 9 | -26/+557 |
| | | | |\ \ \ \ | |||||
| | | | * | | | | | Fixes a deadlock with streaming in Phonon. | unknown | 2010-03-25 | 1 | -6/+0 |
* | | | | | | | | | Fix Phonon compilation with a namespaced Qt. | Thiago Macieira | 2010-04-01 | 6 | -0/+36 |
| |_|_|_|_|_|_|/ |/| | | | | | | | |||||
* | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ... | Qt Continuous Integration System | 2010-03-31 | 3 | -5/+5 |
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | | | |||||
| * | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ... | Qt Continuous Integration System | 2010-03-30 | 3 | -5/+5 |
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | |||||
| | * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ... | Qt Continuous Integration System | 2010-03-30 | 3 | -5/+5 |
| | |\ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | | | |||||
| | | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ... | Qt Continuous Integration System | 2010-03-30 | 3 | -5/+5 |
| | | |\ \ \ \ \ | | | | |_|/ / / | | | |/| | | | | |||||
| | | | * | | | | Update PLATFORM(SPARC64) to CPU(SPARC64) | Thiago Macieira | 2010-03-29 | 1 | -1/+1 |
| | | | * | | | | Trivial fix to JavaScriptCore to fix building with MSVC 2010 | John Brooks | 2010-03-27 | 2 | -4/+4 |
| | | | | |_|/ | | | | |/| | | |||||
* | | | | | | | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6 | Thiago Macieira | 2010-03-31 | 11 | -42/+349 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | |||||
| * | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ... | Qt Continuous Integration System | 2010-03-30 | 7 | -39/+305 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ... | Simon Hausmann | 2010-03-30 | 7 | -39/+305 |
| | | |_|_|/ / | | |/| | | | | |||||
| * | | | | | | Added additional logging to Phonon MMF backend | Gareth Stockwell | 2010-03-30 | 4 | -3/+44 |
| |/ / / / / | |||||
* | | | | | | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6 | Thiago Macieira | 2010-03-30 | 30 | -151/+533 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr... | Qt Continuous Integration System | 2010-03-29 | 1 | -1/+7 |
| |\ \ \ \ \ | |||||
| | * | | | | | Fixed crash in Phonon MMF backend during application shutdown | Gareth Stockwell | 2010-03-29 | 1 | -1/+7 |
| * | | | | | | Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ... | Simon Hausmann | 2010-03-29 | 5 | -14/+46 |
| * | | | | | | Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ... | Simon Hausmann | 2010-03-29 | 3 | -3/+14 |
| * | | | | | | Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ... | Simon Hausmann | 2010-03-29 | 25 | -135/+468 |
| |/ / / / / | |||||
* | | | | | | Merge remote branch 'origin/4.7' into qt-4.7-from-4.6 | Thiago Macieira | 2010-03-30 | 96 | -1915/+3612 |
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | |||||
| * | | | | | Fix typo in phonon/symbian. | Justin McPherson | 2010-03-30 | 1 | -1/+1 |
| * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.... | Qt Continuous Integration System | 2010-03-30 | 96 | -1915/+3612 |
| |\ \ \ \ \ | | |_|/ / / | |/| | | | | |||||
| | * | | | | Merge branch 'phonon-update' into 4.7 | Justin McPherson | 2010-03-29 | 96 | -1915/+3612 |
| | |\ \ \ \ | | | |_|/ / | | |/| | | | |||||
| | | * | | | Phonon core; compile fixes after merge. | Justin McPherson | 2010-03-26 | 2 | -2/+1 |
| | | * | | | Phonon qt7; Compile fixes after merge. | Justin McPherson | 2010-03-26 | 5 | -12/+21 |
| | | * | | | Phonon; complete integration. | Justin McPherson | 2010-03-25 | 12 | -22/+1678 |
| | | * | | | Update Phonon CMakeLists.txt. | Justin McPherson | 2010-03-25 | 1 | -1/+1 |
| | | * | | | Update Phonon qt7 backend to 4.4.0. | Justin McPherson | 2010-03-25 | 10 | -574/+137 |
| | | * | | | Update Phonon ds9 backend to 4.4.0. | Justin McPherson | 2010-03-25 | 33 | -996/+621 |
| | | * | | | Update Phonon GStreamer backend to 4.4.0. | Justin McPherson | 2010-03-25 | 19 | -132/+639 |
| | | * | | | Update Phonon core to 4.4.0 | Justin McPherson | 2010-03-25 | 22 | -193/+531 |
| | | | |/ | | | |/| | |||||
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7 | Martin Jones | 2010-03-25 | 9 | -26/+557 |
| |\ \ \ \ | | |/ / / | |||||
| * | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.7 | Alexis Menard | 2010-03-25 | 14 | -11/+205 |
| |\ \ \ \ | | |_|/ / | |/| | / | | | |/ | | |/| | |||||
* | | | | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6 | Thiago Macieira | 2010-03-29 | 14 | -11/+205 |
|\ \ \ \ | | |/ / | |/| / | |_|/ |/| | | |||||
| * | | Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ... | Simon Hausmann | 2010-03-24 | 6 | -5/+32 |
| * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ... | Qt Continuous Integration System | 2010-03-22 | 11 | -7/+174 |
| |\ \ |