summaryrefslogtreecommitdiffstats
path: root/src/3rdparty
Commit message (Expand)AuthorAgeFilesLines
* 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 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
* | 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
* | | | Merge remote branch 'qt-mainline/master'aavit2011-02-241-1/+1
|\ \ \ \ | |/ / /
| * | | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2011-02-181-1/+1
| |\ \ \ | | |/ /
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-02-181-1/+1
| | |\ \ | | | |/ | | |/|
| | | * Changed the localized vendor name for Qt SIS packages to "Nokia"Eckhart Koppen2011-02-171-1/+1
* | | | Fixes: missing export of gzungetc() from internal zlibaavit2011-02-181-1/+1
|/ / /
* | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-02-104-16/+17
|\ \ \ | |/ /
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-02-081-1/+1
| |\ \ | | |/
| | * Fixed "not a valid preprocessing token" on GCCE.axis2011-02-041-1/+1
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-review into 4.7David Boddie2011-02-031-5/+5
| |\ \
| | * | Doc: Fixed QML, unindented snippet.David Boddie2011-02-011-5/+5
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-review into 4.7David Boddie2011-01-312-10/+11
| |\ \ \ | | |/ / | | | / | | |/ | |/|
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7David Boddie2011-01-269-51/+315
| | |\
| | * | Doc: fixing bugs and misspelling based on feedbackMorten Engvoldsen2011-01-251-1/+1
| | * | Merge branch '4.7' of ../qt into 4.7David Boddie2011-01-1350-54/+128
| | |\ \
| | * \ \ Merge branch '4.7' into qdoc-simplifiedDavid Boddie2010-12-156-6/+6
| | |\ \ \
| | * \ \ \ Merge branch 'qdoc-simplified' into mimir-simplifiedDavid Boddie2010-12-0723-195/+135
| | |\ \ \ \
| | * | | | | doc: Changed a table into 3 tables to eliminate a \raw.Martin Smith2010-10-251-9/+10
* | | | | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-02-014-84/+76
|\ \ \ \ \ \ \ | |/ / / / / /