summaryrefslogtreecommitdiffstats
path: root/src/3rdparty
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into ma...Qt Continuous Integration System2011-11-251-1/+1
|\
| * Symbian-linux crosscompilation case changesPasi Pentikainen2011-11-241-1/+1
* | Hide png symbols in a namespace for -qt-libpngDaniel Teske2011-11-2223-39/+87
* | Webkit: Work around C++11 string literal source incompatibility.hjk2011-11-225-13/+13
* | Add spaces for string concatenation to work around C++11 source incompatibility.hjk2011-11-221-3/+3
|/
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-air-staging into master...Qt Continuous Integration System2011-11-124-6/+28
|\
| * Re-apply change e3208a8d44423bc3b5c32e2e90f68675e51a3b73 by Andreas KlingAndreas Kling2011-11-091-1/+1
| * Re-apply change 37cde52cb17b57f8ec89c248f06331ed4977e51c by Ademar de Souza R...Ademar de Souza Reis Jr2011-11-091-1/+1
| * Re-apply change 945c44d0865cf44363e6c860995f971ce952dd5f by Ademar de Souza R...Ademar de Souza Reis Jr2011-11-091-43/+43
| * Updated WebKit to 52a11cec052aa40d3bbc06861be1177b649b4a99Zeno Albisser2011-11-096-51/+73
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-air-staging into master...Qt Continuous Integration System2011-11-0314-9/+367
|\ \ | |/
| * Re-apply change a14033620fab5edca44293ec6dfcc904e2e0eb20 by Andreas KlingAndreas Kling2011-11-031-1/+1
| * Re-apply change 3489808c1dcd157ac09dd6da16bc057b56696d59 by Ademar de Souza R...Ademar de Souza Reis Jr2011-11-031-1/+1
| * Re-apply change 3dd9e66baaa0848bcc2eb7daecf2b63724624358 by Ademar de Souza R...Ademar de Souza Reis Jr2011-11-031-43/+43
| * Updated WebKit to 99371ddc1d61832131835964a753e1c5817f6916Zeno Albisser2011-11-0315-53/+411
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging into master...Qt Continuous Integration System2011-11-011-1/+1
|\ \
| * | QWebElement example missed informationartoka2011-11-011-1/+1
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2011-10-271-1/+1
|\ \ \
| * | | Harfbuzz shaper: kerning adjustment does not need to be modified by RTLJohn Tapsell2011-10-271-1/+1
| |/ /
* | | Merge remote-tracking branch 'qt-fire-review/master'aavit2011-10-213-6/+6
|\ \ \ | |/ /
| * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into maste...Qt Continuous Integration System2011-10-101-0/+5
| |\ \
| * \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging into master...Qt Continuous Integration System2011-10-033-6/+6
| |\ \ \ | | |_|/ | |/| |
| | * | Update translation sources.Casper van Donderen2011-09-293-6/+6
* | | | Fixes: the png_handle_cHRM crash bug in bundled libpng 1.5.4aavit2011-10-191-6/+8
| |_|/ |/| |
* | | Fixes: libpng symbols exported from QtGui.dll on Windowsaavit2011-10-101-0/+5
|/ /
* | Sentences should end with a period! (Poor man's rebuild trigger.)Andreas Kling2011-09-221-1/+1
* | Workaround MSVC2010 problems when linking QtWebKitAdemar de Souza Reis Jr2011-09-201-1/+1
* | dos2unix on a webkit source file (fix support for Visual Studio)Ademar de Souza Reis Jr2011-09-201-43/+43
|/
* Updated WebKit to 64cce10 (qtwebkit-rc1, week36)Ademar de Souza Reis Jr2011-09-1327-50/+339
* Updated WebKit to a2bd2bb (qtwebkit-2.2-week35)Ademar de Souza Reis Jr2011-09-0626-77/+364
* Updated WebKit to fb3b4700aa5abbb2db471b4f0eb7946ce4850cc4Ademar de Souza Reis Jr2011-08-307-6/+65
* Merge remote-tracking branch 'review/master'Sergio Ahumada2011-08-29474-4847/+10382
|\
| * Do not unconditionally use pkg-config in .pro filesRohan McGovern2011-08-262-2/+2
| * Updated WebKit to dda59e50379214c098f365a39c4d64b39ced427eAdemar de Souza Reis Jr2011-08-268-78/+69
| * Updated WebKit to 85d4df147ac7b239497b05979a51fd6fde7580fdAdemar de Souza Reis Jr2011-08-258-2/+14
| * Updated WebKit to 836fa24be73978fb292e954abb151fb46b1d97e0Ademar de Souza Reis Jr2011-08-2547-71/+1312
| * Updated WebKit to 4277f8277b1daf3ec33c996f5a760ccd1113af4bAdemar de Souza Reis Jr2011-08-18301-22/+392
| * Updated WebKit to 8ed79cb10ca72b5d240beae674a7932963cbd007Ademar de Souza Reis Jr2011-08-114-2/+12
| * Updated WebKit to 66b76cdb8ef823f27a8229c5cae2d35e7f2d3c59Ademar de Souza Reis Jr2011-08-11139-4752/+8663
* | Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7Liang Qi2011-08-1531-2912/+7737
|\ \ | |/ |/|
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2011-08-03127-52415/+26133
| |\
| | * Updating libpng: Patches to libpng 1.5.4 for building it in Qtaavit2011-08-022-5/+18
| | * Updating libpng: Add libpng version 1.5.4aavit2011-08-0241-0/+59715
| | * Updating libpng: Remove version 1.4.0aavit2011-08-02124-86010/+0
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-08-021-107/+0
| |\ \ | | |/ | |/|
| | * Remove DerivedSources.pro from WebKit.Jocelyn Turcotte2011-08-021-107/+0
* | | Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7Liang Qi2011-07-201-0/+3
|\ \ \ | |/ /
| * | Check for buffer overflow in Lookup_MarkMarkPosJiang Jiang2011-07-191-0/+3
| |/
| * Update licenseheader text in source filesJyri Tahtela2011-05-132-34/+34
* | Forward port qt modifications for sqlite3.cCharles Yin2011-07-191-2/+16