summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Fix crash in positionInLigatureJiang Jiang2011-12-161-1/+1
* directfb: Backport the work from QtBase to Qt 4.8Holger Hans Peter Freyther2011-12-1319-282/+653
* [blitter] Work on tst_QPixmap::clear()Holger Hans Peter Freyther2011-12-134-16/+45
* [blitter] Use QScopedPointer for the engine and blittableHolger Hans Peter Freyther2011-12-132-14/+10
* [blitter] Generate a new serial number when resizing theHolger Hans Peter Freyther2011-12-131-0/+1
* [blitter] Fix memory leak in the blitter paintengineHolger Hans Peter Freyther2011-12-131-5/+5
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into ma...Qt Continuous Integration System2011-12-125-6/+21
|\
| * Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-teamQt Continuous Integration System2011-12-125-6/+21
| |\
| | * Revert "Fix memory leaks in OpenVG and OpenGL resource pools"mread2011-12-125-6/+21
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into ma...Qt Continuous Integration System2011-12-124-16/+55
|\ \ \ | |/ /
| * | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-teamQt Continuous Integration System2011-12-092-8/+33
| |\ \ | | |/
| | * Fix window surface config on OpenGL graphics system.Jani Hautakangas2011-12-092-8/+33
| * | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-teamQt Continuous Integration System2011-12-091-0/+4
| |\ \ | | |/
| | * Symbian: Fix a case sensitivity issue with QMAKE_EXTRA_COMPILERSMiikka Heikkinen2011-12-091-0/+4
| * | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-teamQt Continuous Integration System2011-12-091-8/+18
| |\ \ | | |/
| | * Symbian: Fix double deletion of selected text when using predictiveMiikka Heikkinen2011-12-091-8/+18
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qa-staging into master-...Qt Continuous Integration System2011-12-091-0/+1
|\ \ \
| * \ \ Merge remote-tracking branch 'qt-qa-review/master'Sergio Ahumada2011-12-091-0/+1
| |\ \ \ |/ / / /
| * | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-qa-teamQt Continuous Integration System2011-12-0917-113/+396
| |\ \ \
| | * | | tests: fixed compile of qscriptextensionplugin test with high -jNRohan McGovern2011-12-091-0/+1
* | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into ma...Qt Continuous Integration System2011-12-091-1/+4
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-teamQt Continuous Integration System2011-12-081-1/+4
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | Symbian: improving diagnostics for QWaitConditionmread2011-12-081-1/+4
* | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into maste...Qt Continuous Integration System2011-12-093-4/+61
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-teamQt Continuous Integration System2011-12-07575-375/+1048
| |\ \ \ \
| | * \ \ \ Merge remote-tracking branch 'qt-mainline/4.8'aavit2011-12-0732-62/+307
| | |\ \ \ \
| | * \ \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-teamaavit2011-12-023-4/+61
| | |\ \ \ \ \
| | | * | | | | Fix stretched font positions in LionJiang Jiang2011-12-012-2/+9
| * | | | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-teamQt Continuous Integration System2011-12-011-2/+52
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| | * | | | | | Backport writingSystems support code for Cocoa from Qt 5Jiang Jiang2011-12-011-2/+52
* | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-air-staging into master...Qt Continuous Integration System2011-12-087-6/+23
|\ \ \ \ \ \ \ \
| * | | | | | | | Updated WebKit to 83439de78841f9569ad78e3a84b7b888337b5d18Zeno Albisser2011-12-087-6/+23
* | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into ma...Qt Continuous Integration System2011-12-084-11/+20
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / | |/| | | | | | |
| * | | | | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-teamQt Continuous Integration System2011-12-074-11/+20
| |\ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / | | |/| | | | | |
| | * | | | | | | Symbian: Fix language mappings for localize_deploymentMiikka Heikkinen2011-12-073-9/+19
| | * | | | | | | Symbian: Only localize the application .rss that needs it, not all .rssMiikka Heikkinen2011-12-072-2/+1
| * | | | | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-teamQt Continuous Integration System2011-12-072-56/+0
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | Revert "Fix sqlite driver memory eating due to close failure"Honglei Zhang2011-12-072-56/+0
| * | | | | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-teamQt Continuous Integration System2011-12-06539-85/+420
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | Merge remote-tracking branch 'qt/4.8'Pasi Pentikainen2011-12-06539-85/+420
| | |\ \ \ \ \ \ \
* | | \ \ \ \ \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qa-staging into master-...Qt Continuous Integration System2011-12-0826-31/+73
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
| * | | | | | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-qa-teamQt Continuous Integration System2011-12-0732-40/+136
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | tests: make tests compile or disable those which don't compileSergio Ahumada2011-12-0726-31/+73
| | | |_|_|_|_|_|_|/ | | |/| | | | | | |
| * | | | | | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-qa-teamQt Continuous Integration System2011-12-0626-53/+244
| |\ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration in...v4.8.0Qt Continuous Integration System2011-12-073-40/+352
|\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7Liang Qi2011-12-073-40/+352
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / | |/| | | | | | | | | |
| | * | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2011-11-303-40/+352
| | |\ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | Fix HarfBuzz Thai character SARA AM handlingJiang Jiang2011-11-303-40/+352
| | * | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-11-301-14/+26
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / | | |/| | | | | | | | | |
| | | * | | | | | | | | | Reduce unnecessary QtCore DLL loads during Symbian app thread creationmread2011-11-301-14/+26
| | |/ / / / / / / / / /