| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2011-04-18 | 2 | -10/+9 |
|\ |
|
| * | Enable webkit build for the makefile build system with gcce | Liang Qi | 2011-04-07 | 2 | -10/+9 |
|
|
* | | Merge earth-team into origin/master' | Olivier Goffart | 2011-04-12 | 3 | -3/+5 |
|\ \ |
|
| * | | Avoid compilation warnings on Symbian | aavit | 2011-04-06 | 3 | -3/+5 |
|
|
* | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt into earth-master | axis | 2011-04-07 | 267 | -68608/+28173 |
|\ \ \
| |/ / |
|
| * | | Really avoid compiler warnings on Windows | aavit | 2011-04-05 | 4 | -2/+13 |
|
|
| * | | Avoid some compiler warnings on Windows | aavit | 2011-04-04 | 1 | -0/+2 |
|
|
| * | | Merge branch 'jpeg8c' | aavit | 2011-04-04 | 65 | -7524/+393 |
| |\ \ |
|
| | * | | Updating libjpeg: Add Qt building modifications | aavit | 2011-03-28 | 2 | -0/+170 |
|
|
| | * | | Updating libjpeg: Add version 8c. | aavit | 2011-03-28 | 87 | -0/+45145 |
|
|
| | * | | Updating libjpeg: Removing libjpeg version 8 | aavit | 2011-03-28 | 136 | -52446/+0 |
|
|
| * | | | Another compilation fix for WinCE | aavit | 2011-04-04 | 1 | -0/+2 |
|
|
| * | | | Remove obsolete patch file | aavit | 2011-04-03 | 1 | -433/+0 |
|
|
| * | | | Compilation fix for WinCE | aavit | 2011-04-02 | 1 | -1/+1 |
|
|
| * | | | Merge branch 'png151' | aavit | 2011-04-01 | 127 | -51389/+20278 |
| |\ \ \ |
|
| | * | | | Updating libpng: Patches to libpng for building it in Qt | aavit | 2011-03-25 | 3 | -5/+190 |
|
|
| | * | | | Updating libpng: Add libpng version 1.5.1 | aavit | 2011-03-25 | 40 | -0/+54714 |
|
|
| | * | | | Updating libpng: Remove version 1.4.0 | aavit | 2011-03-25 | 124 | -86010/+0 |
| | |/ / |
|
| * | | | Fix compilation of libtiff with zlib 1.2.5 | aavit | 2011-04-01 | 1 | -0/+2 |
|
|
| * | | | Merge branch 'zlib125' | aavit | 2011-04-01 | 72 | -9263/+7486 |
| |\ \ \ |
|
| | * | | | Upgrading zlib: Patches to build internal zlib in Qt | aavit | 2011-03-24 | 2 | -1/+14 |
|
|
| | * | | | Upgrading zlib: Add zlib version 1.2.5 | aavit | 2011-03-24 | 44 | -0/+18973 |
|
|
| | * | | | Upgrading zlib: Remove zlib version 1.2.3 | aavit | 2011-03-24 | 59 | -20763/+0 |
| | |/ / |
|
* | | | | Merge remote branch 'origin/master' into 4.8-earth | Denis Dzyubenko | 2011-03-31 | 1 | -4/+4 |
|\ \ \ \
| |/ / / |
|
| * | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into maste... | Qt Continuous Integration System | 2011-03-28 | 1 | -4/+4 |
| |\ \ \
| | |/ / |
|
| | * | | Implement subpixel positioning with FreeType | Jiang Jiang | 2011-03-22 | 1 | -4/+4 |
|
|
* | | | | Fix errors when compiling Qt with STLport | Cédric OCHS | 2011-03-28 | 1 | -1/+3 |
|/ / / |
|
* | | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2011-03-22 | 1 | -2/+2 |
|\ \ \
| |/ /
|/| /
| |/ |
|
| * | Bump Qt version to 4.7.4 | Timo Turunen | 2011-03-21 | 1 | -2/+2 |
|
|
* | | Merge remote branch 'qt/master' into staging-master | Samuel Rødal | 2011-03-21 | 1 | -0/+3 |
|\ \ |
|
| * \ | Merge remote-tracking branch 'origin/master' into lighthouse-master | Jørgen Lind | 2011-03-17 | 2 | -6/+8 |
| |\ \ |
|
| * | | | Build JavaScriptCore also under unusual platform combination. | con | 2011-03-10 | 1 | -0/+3 |
|
|
* | | | | Merge remote branch 'qt-mainline/master' | aavit | 2011-03-15 | 1 | -2/+2 |
|\ \ \ \
| | |/ /
| |/| | |
|
| * | | | Merge remote-tracking branch 'origin/master' into qt-master-from-4.7 | Thiago Macieira | 2011-03-11 | 1 | -4/+6 |
| |\ \ \ |
|
| * \ \ \ | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7 | Thiago Macieira | 2011-03-11 | 1 | -2/+2 |
| |\ \ \ \
| | |_|/ /
| |/| | /
| | | |/
| | |/| |
|
| | * | | Bump Qt version to 4.7.3 | Timo Turunen | 2011-03-09 | 1 | -2/+2 |
|
|
* | | | | Fix hebrew shaping of characters with multiple diacritics. | Lars Knoll | 2011-03-14 | 1 | -2/+2 |
|
|
* | | | | Fix combining marks shaping without GPOS feature in HarfBuzz | Jiang Jiang | 2011-03-14 | 1 | -1/+1 |
| |_|/
|/| | |
|
* | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master... | Qt Continuous Integration System | 2011-03-08 | 1 | -4/+6 |
|\ \ \
| |/ /
|/| | |
|
| * | | Unbreak build on Mac OS X 10.5 after b0b80d9e8d11c38d | Tor Arne Vestbø | 2011-03-04 | 1 | -1/+1 |
|
|
| * | | Don't treat Objective-C property references as l-values | Tor Arne Vestbø | 2011-03-02 | 1 | -4/+6 |
|
|
* | | | Don't assert in abortEvaluation() autotest | Kent Hansen | 2011-03-01 | 1 | -2/+11 |
|/ / |
|
* | | Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration... | Qt Continuous Integration System | 2011-02-25 | 1 | -2/+2 |
|\ \ |
|
| * \ | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2011-02-23 | 1 | -2/+2 |
| |\ \
| | |/ |
|
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ... | Qt Continuous Integration System | 2011-02-20 | 1 | -2/+2 |
| | |\ |
|
| | | * | Bump QtWebKit version to 2.0.2 | Ademar de Souza Reis Jr | 2011-02-17 | 1 | -2/+2 |
|
|
* | | | | Merge remote branch 'qt-mainline/master' | aavit | 2011-02-24 | 1 | -1/+1 |
|\ \ \ \
| |/ / / |
|
| * | | | Merge branch 4.7 into qt-master-from-4.7 | Qt Continuous Integration System | 2011-02-18 | 1 | -1/+1 |
| |\ \ \
| | |/ / |
|
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr... | Qt Continuous Integration System | 2011-02-18 | 1 | -1/+1 |
| | |\ \
| | | |/
| | |/| |
|
| | | * | Changed the localized vendor name for Qt SIS packages to "Nokia" | Eckhart Koppen | 2011-02-17 | 1 | -1/+1 |
|
|