summaryrefslogtreecommitdiffstats
path: root/src/3rdparty
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-04-1227-401/+1147
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-04-1027-401/+1147
| |\
| | * revert "Fix the Qt build on Mac OS X/Cocoa 64-bit"Kent Hansen2010-04-081-1/+0
| | * Updated JavaScriptCore from /home/khansen/dev/qtwebkit-qtscript-integration t...Kent Hansen2010-04-073-3/+13
| | * Updated JavaScriptCore from /home/khansen/dev/qtwebkit-qtscript-integration t...Kent Hansen2010-04-073-3/+14
| | * Updated JavaScriptCore from /home/khansen/dev/qtwebkit-qtscript-integration t...Kent Hansen2010-04-073-8/+42
| | * Updated JavaScriptCore from /home/khansen/dev/qtwebkit-qtscript-integration t...Kent Hansen2010-04-078-359/+823
| | * Updated JavaScriptCore from /home/khansen/dev/qtwebkit-qtscript-integration t...Kent Hansen2010-04-073-2/+10
| | * Updated JavaScriptCore from /home/khansen/dev/qtwebkit-qtscript-integration t...Kent Hansen2010-04-074-2/+27
| | * Updated JavaScriptCore from /home/khansen/dev/qtwebkit-qtscript-integration t...Kent Hansen2010-04-0711-10/+111
| | * Updated JavaScriptCore from /home/khansen/dev/qtwebkit-qtscript-integration t...Kent Hansen2010-04-073-2/+15
| | * Updated JavaScriptCore from /home/khansen/dev/qtwebkit-qtscript-integration t...Kent Hansen2010-04-073-2/+13
| | * Updated JavaScriptCore from /home/khansen/dev/qtwebkit-qtscript-integration t...Kent Hansen2010-04-074-8/+31
| | * Updated JavaScriptCore from /home/khansen/dev/qtwebkit-qtscript-integration t...Kent Hansen2010-04-073-7/+44
| | * Updated JavaScriptCore from /home/khansen/dev/qtwebkit-qtscript-integration t...Kent Hansen2010-04-073-6/+16
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-04-102-2/+3
|\ \ \ | |/ / |/| |
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-04-102-2/+3
| |\ \
| | * | Update Symbian def files for 4.7Shane Kearns2010-04-072-2/+3
| | |/
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-04-101-1/+5
|\ \ \ | |/ / |/| |
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-04-071-1/+5
| |\ \ | | |/ | |/|
| | * Fix Phonon build with mingw.Andrew den Exter2010-04-071-1/+5
* | | 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
| | | |_|_|/ / | | |/| | | |