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-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
| |\ \ \ \ | | |_|/ / | |/| | / | | | |/ | | |/|
* | | | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2010-03-2914-11/+205
|\ \ \ \ | | |/ / | |/| / | |_|/ |/| |
| * | Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ...Simon Hausmann2010-03-246-5/+32
| * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-03-2211-7/+174
| |\ \
| | * | Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ...Simon Hausmann2010-03-2211-7/+174
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-03-239-26/+557
|\ \ \ \ | |_|_|/ |/| | |
| * | | add file missing in commit 74f5e34979b8a08a91aa3c2fa6d252e68eca7817Lars Knoll2010-03-221-0/+442
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-03-228-26/+115
| |\ \ \
| | * | | Add support for polyphonic greekLars Knoll2010-03-225-24/+110
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-03-213-2/+5
| | |\ \ \
| | | * | | Disable C++0x mode for QtWebKit and QtScript since WebKit will not compile an...Thiago Macieira2010-03-201-0/+3
| | | * | | Compile Phonon in C++0x mode.Thiago Macieira2010-03-201-1/+1
| | | * | | Merge remote branch 'origin/4.7' into oslo-staging-1Aaron McCarthy2010-03-192-6/+9
| | | |\ \ \
| | | * | | | Fix JSC export macrosKent Hansen2010-03-181-1/+1
* | | | | | | Fix compile on symbian better.Thomas Zander2010-03-222-4/+4
|/ / / / / /
* | | | | | Merge branch '4.6-s60' into 4.7-s60axis2010-03-2231-1163/+2014
|\ \ \ \ \ \ | |/ / / / / |/| | | / / | | |_|/ / | |/| | |
| * | | | Fixed updating the VKB display when inputting into QGraphicsWebView.axis2010-03-223-0/+32
| | |_|/ | |/| |
| * | | Added support for video surfaces to Phonon MMF backendGareth Stockwell2010-03-1828-1163/+1982
* | | | gcc for Symbian doesn't support gcc extensions like atomicity.h - disableIain2010-03-192-4/+4
| |_|/ |/| |
* | | Fixed wrong qmake logic for Symbian.axis2010-03-181-2/+1
* | | This should likely get webkit linking again on windows/sbsv2Thomas Zander2010-03-171-0/+1