Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration... | Qt Continuous Integration System | 2011-03-14 | 1 | -2/+9 |
|\ | |||||
| * | Merge branch 4.7 into qt-master-from-4.7 | Qt Continuous Integration System | 2011-03-14 | 1 | -2/+9 |
| |\ | |||||
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration | Qt Continuous Integration System | 2011-03-14 | 1 | -2/+9 |
| | |\ | |||||
| | | * | Fix TextEdit mouseSelectionMode overriding selectByMouse. | Andrew den Exter | 2011-03-14 | 1 | -2/+9 |
* | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into maste... | Qt Continuous Integration System | 2011-03-14 | 1 | -1/+2 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | Fix combining marks handling in Core Text shaper | Jiang Jiang | 2011-03-11 | 1 | -1/+2 |
* | | | | Merge remote-tracking branch 'origin/master' into qt-master-from-4.7 | Thiago Macieira | 2011-03-11 | 12 | -12/+12 |
|\ \ \ \ | |||||
| * | | | | Update copyright year to 2011. | Rohan McGovern | 2011-03-10 | 12 | -12/+12 |
| |/ / / | |||||
* | | | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7 | Thiago Macieira | 2011-03-11 | 1 | -1/+1 |
|\ \ \ \ | |/ / / |/| / / | |/ / | |||||
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ... | Qt Continuous Integration System | 2011-03-10 | 1 | -1/+1 |
| |\ \ | |||||
| | * | | Not requiring valid QTextBlock in previous() | Jiang Jiang | 2011-03-10 | 1 | -1/+1 |
* | | | | Merge branch 4.7 into qt-master-from-4.7 | Qt Continuous Integration System | 2011-03-09 | 1 | -1/+1 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration | Qt Continuous Integration System | 2011-03-09 | 1 | -1/+1 |
| |\ \ \ | | | |/ | | |/| | |||||
| | * | | Update TextEdit's visible selection when only the anchor changes. | Andrew den Exter | 2011-03-08 | 1 | -1/+1 |
* | | | | Merge branch 4.7 into qt-master-from-4.7 | Qt Continuous Integration System | 2011-03-04 | 1 | -2/+4 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration | Qt Continuous Integration System | 2011-03-04 | 1 | -2/+4 |
| |\ \ \ | | |/ / | |||||
| | * | | Fix potential crash in QTextControl. | Lasse Holmstedt | 2011-03-04 | 1 | -2/+4 |
* | | | | Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration... | Qt Continuous Integration System | 2011-03-01 | 1 | -2/+3 |
|\ \ \ \ | |||||
| * \ \ \ | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2011-03-01 | 1 | -2/+3 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ... | Qt Continuous Integration System | 2011-02-28 | 2 | -7/+13 |
| | |\ \ \ | | | |/ / | | |/| / | | | |/ | |||||
| | | * | Fix Mac synthesized italic fonts clipping issue for QGLWidget | Jiang Jiang | 2011-02-28 | 1 | -5/+10 |
| | | * | Merge branch 'graphics-team-text-4.7' into 4.7 | Eskil Abrahamsen Blomfeldt | 2011-02-28 | 1 | -2/+3 |
| | | |\ | |||||
| | | | * | Fix cursor position adjustment when removing strings | Jiang Jiang | 2011-01-25 | 1 | -1/+3 |
| | | | * | Fix out of bounds handling in Mac shaper | Jiang Jiang | 2011-01-14 | 1 | -2/+3 |
* | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into maste... | Qt Continuous Integration System | 2011-03-01 | 4 | -0/+32 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-team | aavit | 2011-02-28 | 4 | -0/+32 |
| |\ \ \ \ | |||||
| | * | | | | Resolve font alias before testing for exact matching | Jiang Jiang | 2011-02-28 | 4 | -0/+32 |
* | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master... | Qt Continuous Integration System | 2011-02-28 | 3 | -32/+66 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | |||||
| * | | | | | Ammend INTEGRITY fixes | Harald Fernengel | 2011-02-23 | 1 | -3/+4 |
| * | | | | | Compile for systems without mmap | Rolland Dudemaine | 2011-02-22 | 1 | -10/+40 |
| * | | | | | Various INTEGRITY fixes | Rolland Dudemaine | 2011-02-22 | 2 | -22/+25 |
* | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into maste... | Qt Continuous Integration System | 2011-02-28 | 1 | -11/+0 |
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | |||||
| * | | | | | Stop using XLFD as fontconfig matching fallback | Jiang Jiang | 2011-02-24 | 1 | -11/+0 |
* | | | | | | Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration... | Qt Continuous Integration System | 2011-02-25 | 2 | -41/+99 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | |||||
| * | | | | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2011-02-23 | 2 | -41/+99 |
| |\ \ \ \ \ | | |/ / / / | |/| / / / | | |/ / / | |||||
| | * | | | Forward mouse events from TextInput and TextEdit to QInputContext. | Andrew den Exter | 2011-02-21 | 2 | -41/+99 |
| | * | | | Use same values for Text.lineHeightMode and QTextBlock::lineHeightMode from m... | Yann Bodson | 2011-02-09 | 2 | -4/+8 |
* | | | | | Check engine existence before increasing reference count | Jiang Jiang | 2011-02-23 | 1 | -3/+6 |
* | | | | | Keep reference count for cached font engines in QTextEngine | Jiang Jiang | 2011-02-23 | 1 | -0/+15 |
|/ / / / | |||||
* | | | | Revert part of commit 7c1ab9b6a8 | Olivier Goffart | 2011-02-09 | 2 | -17/+2 |
* | | | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2011-02-04 | 5 | -7/+69 |
|\ \ \ \ | |/ / / | |||||
| * | | | Add a mouseSelectionMode property to TextEdit and TextInput. | Andrew den Exter | 2011-02-01 | 3 | -4/+30 |
| * | | | Add support for line spacing in Text element. | Yann Bodson | 2011-01-28 | 2 | -3/+19 |
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into qtquick11 | Bea Lam | 2011-01-27 | 4 | -27/+553 |
| |\ \ \ | | |/ / | |||||
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into qtquick11 | Martin Jones | 2011-01-19 | 96 | -112/+112 |
| |\ \ \ | | | |/ | | |/| | |||||
| * | | | Disable dragging text in TextEdit. | Andrew den Exter | 2011-01-11 | 3 | -1/+21 |
* | | | | Merge branch 'integration' | Yoann Lopes | 2011-02-02 | 3 | -3/+19 |
|\ \ \ \ | |||||
| * | | | | Fixes lastResortFamily() on Symbian when using FreeType. | Yoann Lopes | 2011-01-31 | 1 | -2/+16 |
| * | | | | Fixes compilation when using FreeType on Symbian. | Yoann Lopes | 2011-01-31 | 2 | -1/+3 |
* | | | | | Merge branch 'staging-master' of scm.dev.nokia.troll.no:qt/qt-lighthouse into... | Qt Continuous Integration System | 2011-01-27 | 4 | -7/+12 |
|\ \ \ \ \ |