summaryrefslogtreecommitdiffstats
path: root/src/3rdparty
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-04-173-3/+7
|\
| * Symbol visibility fixes for RVCT4 on SymbianIain2010-04-161-1/+1
| * Webkit got bigger, make it link again on armlinkThomas Zander2010-04-161-1/+4
| * Set library path properly for all systemsThomas Zander2010-04-161-1/+2
* | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Olivier Goffart2010-04-1613-125/+221
|\ \ | |/ |/|
| * Update WebKit DEF files on SymbianIain2010-04-152-2/+3
| * Symbol visibility fixes for RVCT4 on SymbianIain2010-04-151-1/+1
| * Phonon MMF: fixed crash during opening of video clipGareth Stockwell2010-04-152-57/+58
| * Phonon MMF: ensure initial volume is appliedGareth Stockwell2010-04-151-3/+2
| * Phonon MMF: fix state changes emitted during playlist handlingGareth Stockwell2010-04-151-0/+5
| * Phonon MMF: calling pause() when in StoppedState triggers stateChanged()Gareth Stockwell2010-04-156-29/+71
| * Phonon MMF: change to PausedState, not StoppedState when finishedGareth Stockwell2010-04-151-1/+1
| * Phonon MMF: Suppress intermediate stateChanged() signalGareth Stockwell2010-04-152-8/+16
| * Phonon MMF: Emit tick() signalGareth Stockwell2010-04-151-0/+1
| * Phonon MMF: Emit prefinishMarkReached(), finished() signalsGareth Stockwell2010-04-153-2/+18
| * Phonon MMF: Removed compiler warningGareth Stockwell2010-04-151-1/+1
| * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-04-141-1/+1
| |\
| | * Phonon MMF: fixed typo in trace statementGareth Stockwell2010-04-141-1/+1
| * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-04-145-2/+25
| |\ \
| | * | Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ...Simon Hausmann2010-04-145-2/+25
| | |/
| * | merge commit c638ddc70f6a8196f2c8b11808ab01510233a0ee from harfbuzz:Lars Knoll2010-04-143-50/+193
| |/
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-04-141-1/+1
|\ \
| * | Phonon MMF: fixed typo in trace statementGareth Stockwell2010-04-141-1/+1
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-04-1433-621/+999
|\ \ \ | |/ / |/| |
| * | Revert "removed a few warnings on wince builds"Paul Olav Tvete2010-04-131-4/+4
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-04-1334-625/+1003
| |\ \
| | * | removed a few warnings on wince buildsThierry Bastian2010-04-131-4/+4
| | * | Build fixThierry Bastian2010-04-121-10/+0
| | * | Merge commit 'internal-qt-repo/4.7' into oslo-staging-2/4.7Tom Cooksey2010-04-123-2/+16
| | |\ \
| | * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-04-1033-620/+999
| | |\ \ \
| | | * | | Revert "Update Phonon ds9 backend to 4.4.0."Thierry Bastian2010-04-0733-620/+999
* | | | | | QtWebKit: Corrects symbols visibility for JavaScriptCore.Jocelyn Turcotte2010-04-131-0/+4
* | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-04-133626-151601/+318224
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | QtWebKit: Fix the QWebHistory serialization auto-testJocelyn Turcotte2010-04-132-9/+16
| * | | | | Mark QWebFrame::overloadedSlots autotest as expected failureKent Hansen2010-04-131-0/+1
| * | | | | QtWebKit: Fix autotests .qrc file paths when built from tests/auto/qweb*Jocelyn Turcotte2010-04-1312-10/+20
| * | | | | QtWebKit: Build fix for WinCE.Jocelyn Turcotte2010-04-121-2/+2
| * | | | | Fix the build of webkit examples on platforms without OpenGL and MultimediaSimon Hausmann2010-04-121-2/+2
| * | | | | QtWebKit: Fix build on mac.Jocelyn Turcotte2010-04-122-8/+14
| * | | | | QtWebKit: Fix build on WinCE, adding missing include path.Jocelyn Turcotte2010-04-122-9/+3
| * | | | | QtWebKit: Add missing namespace wrapper temporarily until next import.Jocelyn Turcotte2010-04-126-0/+13
| * | | | | QtWebKit: fix build with qws temporarily until next import.Jocelyn Turcotte2010-04-122-8/+4
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into qtwebkitStaging-4.7Jocelyn Turcotte2010-04-124-7/+16
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| * | | | | Update src/3rdparty/webkit from trunk.Jocelyn Turcotte2010-04-1264-1038/+1800
| * | | | | Fix failing assertions in debug buildsSimon Hausmann2010-04-093-5/+2
| * | | | | Fix the build of webkit examples on platforms without OpenGL and MultimediaSimon Hausmann2010-04-081-2/+2
| * | | | | QtWebKit: Fix build on mac.Jocelyn Turcotte2010-04-082-8/+14
| * | | | | QtWebKit: Build fix for WinCE.Jocelyn Turcotte2010-04-071-2/+2
| * | | | | QtWebKit: Fix build on WinCE, adding missing include path.Jocelyn Turcotte2010-04-072-9/+3
| * | | | | QtWebKit: Add missing namespace wrapper temporarily until next import.Jocelyn Turcotte2010-04-066-0/+13