summaryrefslogtreecommitdiffstats
path: root/src/3rdparty
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 4.7 into qt-4.8-from-4.7Qt Continuous Integration System2011-05-041-0/+1
|\
| * Don't rely on uninitialized dataJoão Abecasis2011-05-031-0/+1
* | Merge branch 4.7 into qt-4.8-from-4.7Qt Continuous Integration System2011-04-282-0/+50
|\ \ | |/
| * Legal: add the license header to the hand-editsThiago Macieira2011-04-272-0/+50
* | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-04-182-10/+9
|\ \ | |/
| * Enable webkit build for the makefile build system with gcceLiang Qi2011-04-072-10/+9
* | Merge earth-team into origin/master'Olivier Goffart2011-04-123-3/+5
|\ \
| * | Avoid compilation warnings on Symbianaavit2011-04-063-3/+5
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt into earth-masteraxis2011-04-07267-68608/+28173
|\ \ \ | |/ /
| * | Really avoid compiler warnings on Windowsaavit2011-04-054-2/+13
| * | Avoid some compiler warnings on Windowsaavit2011-04-041-0/+2
| * | Merge branch 'jpeg8c'aavit2011-04-0465-7524/+393
| |\ \
| | * | Updating libjpeg: Add Qt building modificationsaavit2011-03-282-0/+170
| | * | Updating libjpeg: Add version 8c.aavit2011-03-2887-0/+45145
| | * | Updating libjpeg: Removing libjpeg version 8aavit2011-03-28136-52446/+0
| * | | Another compilation fix for WinCEaavit2011-04-041-0/+2
| * | | Remove obsolete patch fileaavit2011-04-031-433/+0
| * | | Compilation fix for WinCEaavit2011-04-021-1/+1
| * | | Merge branch 'png151'aavit2011-04-01127-51389/+20278
| |\ \ \
| | * | | Updating libpng: Patches to libpng for building it in Qtaavit2011-03-253-5/+190
| | * | | Updating libpng: Add libpng version 1.5.1aavit2011-03-2540-0/+54714
| | * | | Updating libpng: Remove version 1.4.0aavit2011-03-25124-86010/+0
| | |/ /
| * | | Fix compilation of libtiff with zlib 1.2.5aavit2011-04-011-0/+2
| * | | Merge branch 'zlib125'aavit2011-04-0172-9263/+7486
| |\ \ \
| | * | | Upgrading zlib: Patches to build internal zlib in Qtaavit2011-03-242-1/+14
| | * | | Upgrading zlib: Add zlib version 1.2.5aavit2011-03-2444-0/+18973
| | * | | Upgrading zlib: Remove zlib version 1.2.3aavit2011-03-2459-20763/+0
| | |/ /
* | | | Merge remote branch 'origin/master' into 4.8-earthDenis Dzyubenko2011-03-311-4/+4
|\ \ \ \ | |/ / /
| * | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into maste...Qt Continuous Integration System2011-03-281-4/+4
| |\ \ \ | | |/ /
| | * | Implement subpixel positioning with FreeTypeJiang Jiang2011-03-221-4/+4
* | | | Fix errors when compiling Qt with STLportCédric OCHS2011-03-281-1/+3
|/ / /
* | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-03-221-2/+2
|\ \ \ | |/ / |/| / | |/
| * Bump Qt version to 4.7.4Timo Turunen2011-03-211-2/+2
* | Merge remote branch 'qt/master' into staging-masterSamuel Rødal2011-03-211-0/+3
|\ \
| * \ Merge remote-tracking branch 'origin/master' into lighthouse-masterJørgen Lind2011-03-172-6/+8
| |\ \
| * | | Build JavaScriptCore also under unusual platform combination.con2011-03-101-0/+3
* | | | Merge remote branch 'qt-mainline/master'aavit2011-03-151-2/+2
|\ \ \ \ | | |/ / | |/| |
| * | | Merge remote-tracking branch 'origin/master' into qt-master-from-4.7Thiago Macieira2011-03-111-4/+6
| |\ \ \
| * \ \ \ Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Thiago Macieira2011-03-111-2/+2
| |\ \ \ \ | | |_|/ / | |/| | / | | | |/ | | |/|
| | * | Bump Qt version to 4.7.3Timo Turunen2011-03-091-2/+2
* | | | Fix hebrew shaping of characters with multiple diacritics.Lars Knoll2011-03-141-2/+2
* | | | Fix combining marks shaping without GPOS feature in HarfBuzzJiang Jiang2011-03-141-1/+1
| |_|/ |/| |
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2011-03-081-4/+6
|\ \ \ | |/ / |/| |
| * | Unbreak build on Mac OS X 10.5 after b0b80d9e8d11c38dTor Arne Vestbø2011-03-041-1/+1
| * | Don't treat Objective-C property references as l-valuesTor Arne Vestbø2011-03-021-4/+6
* | | Don't assert in abortEvaluation() autotestKent Hansen2011-03-011-2/+11
|/ /
* | Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration...Qt Continuous Integration System2011-02-251-2/+2
|\ \
| * \ Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-02-231-2/+2
| |\ \ | | |/
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-02-201-2/+2
| | |\
| | | * Bump QtWebKit version to 2.0.2Ademar de Souza Reis Jr2011-02-171-2/+2