summaryrefslogtreecommitdiffstats
path: root/src/3rdparty
Commit message (Expand)AuthorAgeFilesLines
* Updated WebKit to 3f0f51f4c87e65bfe04165c6af4c00934b0ca1e2Simon Hausmann2010-05-034-3/+14
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-05-039-168/+304
|\
| * Updated WebKit to 8941bee5706ef2171ed5def63834deefc7440d11Simon Hausmann2010-05-039-168/+304
* | Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2010-05-021-1/+1
|\ \ | |/ |/|
| * Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2010-05-021-1/+1
| |\
| | * Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2010-05-011-1/+1
| | |\
| | | * Fixed incorrect runtime platform version check in Phonon MMF backendGareth Stockwell2010-04-301-1/+1
| | | * Re-apply change 5107946e97cbc480a9329565c29b7384c8ba0860 by IainIain2010-04-262-2/+3
| | | * Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ...Simon Hausmann2010-04-267-5/+47
| | | * Fix accidental change in QtWebKitMarkus Goetz2010-04-201-3/+1
| | | * QNAM HTTP: Pipelining improvementMarkus Goetz2010-04-201-1/+3
| | | * Fix the include header <qstring.h> -> <QtCore/qstring.h>Thiago Macieira2010-04-191-1/+1
| | | * Re-apply change f14ae11e6731bd7416f45c3ef7ce464587862223 by IainIain2010-04-172-2/+3
| | | * Re-apply change 81837e43e3f966c1755e90eb65df6e3bad506ed7 by IainIain2010-04-171-1/+1
| | | * Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ...Simon Hausmann2010-04-177-35/+57
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-05-02110-1671/+4581
|\ \ \ \ | |/ / / |/| | |
| * | | Updated WebKit to 540ae4ccd25609e1bfe1673195ce126255e36774Simon Hausmann2010-04-307-3/+87
| * | | Updated WebKit to 2c346f58ae70470d88dcd856bfe59b04a144b65aSimon Hausmann2010-04-304-32/+73
| * | | Updated WebKit to 1a40220a82197023c1b1ac6eff027be6dd3168d3Simon Hausmann2010-04-296-10/+31
| * | | Updated WebKit to 2992802f35fd47e32bb94a4b1f48cce7ec7fda9dSimon Hausmann2010-04-299-74/+174
| * | | Updated WebKit to 862268aeb7150d3795d05bfc05f661bb5c598a27Simon Hausmann2010-04-28107-1578/+4242
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-05-021-2/+1
|\ \ \ \ | |_|/ / |/| | |
| * | | Fix libinfix usageThomas Zander2010-04-291-2/+1
| |/ /
* | | Fix the include header <qstring.h> -> <QtCore/qstring.h>Thiago Macieira2010-05-011-1/+1
|/ /
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-04-242-5/+5
|\ \
| * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-04-232-5/+5
| |\ \
| | * \ Merge branch '4.7' of ../../qt/4.7 into 4.7Justin McPherson2010-04-2218-35/+103
| | |\ \
| | * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-04-182-5/+5
| | |\ \ \
| | | * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-04-182-5/+5
| | | |\ \ \
| | | | * | | WebKit; build with change to mediaservices.Justin McPherson2010-04-161-3/+3
| | | | * | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-multimedia-staging int...Justin McPherson2010-04-151-1/+1
| | | | |\ \ \
| | | | * | | | Create Mediaservices lib, separate from Multimedia.Justin McPherson2010-04-151-2/+2
* | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7Janne Koskinen2010-04-234-11/+60
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-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
| | | | |/ / / / / | | | |/| | | | |
* | | | | | | | | DEF file fixJanne Koskinen2010-04-231-25/+24
| |_|_|/ / / / / |/| | | | | | |
* | | | | | | | QtWebkit WINS DEF file freezeJanne Koskinen2010-04-221-1/+27
|/ / / / / / /
* | | | | | | 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
| |\ \ \ \ \ | | |/ / / / | |/| | | |