Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into maste... | Qt Continuous Integration System | 2011-06-14 | 12 | -97/+205 |
|\ | |||||
| * | Allow selecting fonts with irregular style names | Jiang Jiang | 2011-06-10 | 11 | -96/+204 |
| * | Fix missing empty lines in Qt HTML when displayed in compliant browsers | Eskil Abrahamsen Blomfeldt | 2011-06-10 | 1 | -1/+1 |
* | | Fix alignment value not handled in ODF | Thiago Macieira | 2011-06-14 | 1 | -0/+1 |
|/ | |||||
* | Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration in... | Qt Continuous Integration System | 2011-06-08 | 1 | -1/+1 |
|\ | |||||
| * | Merge remote-tracking branch 'origin/4.8' into qt-4.8-from-4.7 | Liang Qi | 2011-06-06 | 1 | -2/+2 |
| |\ | |||||
| * | | Fix broken drawing with large fonts using QStaticText and FreeType | Eskil Abrahamsen Blomfeldt | 2011-05-24 | 1 | -1/+1 |
* | | | Fix compile when configure with no fontconfig support | Jiang Jiang | 2011-06-08 | 1 | -3/+3 |
* | | | Fix warning in qtextengine compilation | Jiang Jiang | 2011-06-08 | 1 | -1/+1 |
* | | | Reorder member varibles in QGlyphRunPrivate to eliminate warning | Jiang Jiang | 2011-06-08 | 1 | -4/+4 |
* | | | Revert 36e01e69 | Jiang Jiang | 2011-06-08 | 1 | -4/+0 |
* | | | Add function QGlyphRun::setRawData() | Eskil Abrahamsen Blomfeldt | 2011-06-06 | 4 | -46/+101 |
* | | | Merge remote branch 'qt/4.8' into fire-master | Paul Olav Tvete | 2011-06-06 | 117 | -2001/+2002 |
|\ \ \ | | |/ | |/| | |||||
| * | | Fix build in C++0x mode | Bernhard Rosenkraenzer | 2011-05-31 | 1 | -2/+2 |
| |/ | |||||
| * | Merge remote-tracking branch 'qt/4.8' | Jyri Tahtela | 2011-05-18 | 22 | -171/+230 |
| |\ | |||||
| | * | Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration in... | Qt Continuous Integration System | 2011-05-17 | 4 | -9/+10 |
| | |\ | |||||
| | | * | Merge branch 4.7 into qt-4.8-from-4.7 | Qt Continuous Integration System | 2011-05-13 | 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-05-13 | 1 | -1/+1 |
| | | | |\ | |||||
| | | | | * | Make TextEdit word selection more natural. | Andrew den Exter | 2011-05-13 | 1 | -1/+1 |
| | | * | | | Merge branch 4.7 into qt-4.8-from-4.7 | Qt Continuous Integration System | 2011-05-12 | 1 | -1/+3 |
| | | |\ \ \ | | | | |/ / | |||||
| | | | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration | Qt Continuous Integration System | 2011-05-12 | 1 | -1/+3 |
| | | | |\ \ | | | | | |/ | |||||
| | | | | * | Ensure the TextEdit cursor delegate is repositioned on mouse events. | Andrew den Exter | 2011-05-12 | 1 | -1/+3 |
| | | | | * | Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt into 4.7 | Martin Jones | 2011-04-27 | 9 | -52/+76 |
| | | | | |\ | |||||
| | | * | | \ | Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7 | Olivier Goffart | 2011-05-06 | 3 | -7/+6 |
| | | |\ \ \ \ | | | | |/ / / | |||||
| | | | * | | | memory leak fix | Tero Toivola | 2011-05-03 | 1 | -0/+4 |
| | | | * | | | Revert symbol addition in b033bb9 | Jiang Jiang | 2011-04-29 | 2 | -7/+2 |
| * | | | | | | Update licenseheader text in source files for qt4.8 | Jyri Tahtela | 2011-05-13 | 117 | -1990/+1990 |
| | |/ / / / | |/| | | | | |||||
* | | | | | | Correct antialias disabling logic for Core Text | Jiang Jiang | 2011-06-04 | 1 | -3/+2 |
* | | | | | | Keep line consistency with text baseline | Jiang Jiang | 2011-05-30 | 1 | -4/+4 |
* | | | | | | Fix compile for systems with old fontconfig | Jiang Jiang | 2011-05-27 | 1 | -0/+5 |
* | | | | | | Fix boundry conditions for cursor hit test | Jiang Jiang | 2011-05-25 | 1 | -1/+1 |
* | | | | | | Fix QFontEngineX11FT compilation | Jiang Jiang | 2011-05-25 | 1 | -0/+2 |
* | | | | | | Fix cursor position test on CursorOnCharacter case | Jiang Jiang | 2011-05-25 | 3 | -4/+9 |
* | | | | | | Support placing cursor in ligature with mouse or touch | Jiang Jiang | 2011-05-23 | 3 | -7/+77 |
* | | | | | | Fix ligature offset in multi-line text | Jiang Jiang | 2011-05-20 | 1 | -2/+2 |
* | | | | | | Workaround a bug in Core Text to select Light fonts | Jiang Jiang | 2011-05-16 | 1 | -1/+6 |
| |/ / / / |/| | | | | |||||
* | | | | | Move QTextCursor::MoveStyle to Qt namespace | Jiang Jiang | 2011-05-11 | 9 | -31/+27 |
* | | | | | Add some QRawFont related low level functions to avoid extra copying | Jiang Jiang | 2011-05-10 | 2 | -5/+55 |
* | | | | | Compile on Mac | Eskil Abrahamsen Blomfeldt | 2011-05-10 | 1 | -2/+2 |
* | | | | | Rename QGlyphs -> QGlyphRun | Eskil Abrahamsen Blomfeldt | 2011-05-10 | 9 | -120/+121 |
* | | | | | Fix QRawFont::setPixelSize() on Mac | Eskil Abrahamsen Blomfeldt | 2011-05-06 | 1 | -1/+1 |
* | | | | | Merge remote branch 'qt-mainline/4.8' | aavit | 2011-05-06 | 3 | -13/+20 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into maste... | Qt Continuous Integration System | 2011-05-05 | 6 | -107/+65 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into ma... | Qt Continuous Integration System | 2011-05-05 | 1 | -11/+19 |
| |\ \ \ \ \ | |||||
| | * \ \ \ \ | Merge remote-tracking branch 'qt/4.8' | Sami Lempinen | 2011-04-28 | 36 | -357/+2654 |
| | |\ \ \ \ \ | |||||
| | * | | | | | | Make text rendering working outside the gui thread on Symbian. | Laszlo Agocs | 2011-04-26 | 1 | -11/+19 |
| * | | | | | | | Merge earth-team into origin/4.8 | Olivier Goffart | 2011-05-03 | 37 | -424/+905 |
| |\ \ \ \ \ \ \ | |||||
| * | | | | | | | | Fixes warnings about unused variables | Olivier Goffart | 2011-04-28 | 2 | -2/+1 |
* | | | | | | | | | Only enable design metrics for scalable fonts | Jiang Jiang | 2011-05-05 | 1 | -1/+1 |
* | | | | | | | | | Add a way to retrieve CTFontRef from QFont | Jiang Jiang | 2011-05-05 | 2 | -3/+6 |