summaryrefslogtreecommitdiffstats
path: root/src/3rdparty
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-04-221-1/+27
|\
| * QtWebkit WINS DEF file freezeJanne Koskinen2010-04-221-1/+27
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-04-214-11/+60
|\ \ | |/ |/|
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-04-214-11/+60
| |\
| | * fix typosOswald Buddenhagen2010-04-201-1/+1
| | * Fix Mac OS Tiger-vs-Leopard crash due to memory tagging by JavaScriptCoreKent Hansen2010-04-203-10/+59
* | | Compile fix for Visual Studio 2010 (VC10)Prasanth Ullattil2010-04-213-3/+7
|/ /
* | QtWebKit: Fixes compilation on MSVC 64Jocelyn Turcotte2010-04-193-4/+4
* | QtWebKit: Remove translatable strings from tests/hybridPixmap.Jocelyn Turcotte2010-04-191-5/+5
* | Remove overloaded placement new operatorsJanne Koskinen2010-04-192-2/+0
* | WINSCW compiler fix, too eager to solve inlinesJanne Koskinen2010-04-191-2/+4
* | WINSCW boolean fix for XPATHJanne Koskinen2010-04-192-2/+16
* | WINSCW compile fix for HashMapJanne Koskinen2010-04-191-4/+4
* | WINSCW compile fix for WebCoreJanne Koskinen2010-04-191-2/+3
|/
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-04-185-0/+12
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-04-175-0/+12
| |\
| | * Fixed compile of JavaScriptCore for Symbian^3.Rohan McGovern2010-04-161-0/+2
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-04-154-0/+10
| | |\
| | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-04-144-0/+10
| | | |\
| | | | * Fix compilation: StringImpl has no public, default constructorThiago Macieira2010-04-142-0/+3
| | | | * JavaScriptCore doesn't need QtGuiThiago Macieira2010-04-141-0/+1
| | | | * Disable C++0x mode for QtWebKit and QtScript since WebKit will not compile an...Thiago Macieira2010-04-142-0/+6
* | | | | 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