Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
* | | | | | 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 |
* | | | | | | | | | Include pixel size of font in exported HTML from QTextDocument | Eskil Abrahamsen Blomfeldt | 2011-05-04 | 1 | -0/+8 |
| |_|_|_|/ / / / |/| | | | | | | | |||||
* | | | | | | | | Remove QFontEngineFT::loadGlyphMetrics | Jiang Jiang | 2011-05-03 | 2 | -101/+0 |
* | | | | | | | | Add required font metrics functions to QRawFont | Jiang Jiang | 2011-05-02 | 2 | -0/+56 |
* | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-team | aavit | 2011-05-02 | 4 | -6/+9 |
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | |||||
| * | | | | | | | Make pixel size a qreal in QRawFont | Eskil Abrahamsen Blomfeldt | 2011-05-02 | 2 | -5/+5 |
| * | | | | | | | Make sure removed QTextBlock is invalid | Jiang Jiang | 2011-04-29 | 3 | -1/+11 |
| * | | | | | | | Make sure QFont's resolve mask is copied on compilers with C++0x support | Eskil Abrahamsen Blomfeldt | 2011-04-29 | 1 | -1/+1 |
| * | | | | | | | Fix glyph position issue with fallback fonts | Jiang Jiang | 2011-04-29 | 1 | -0/+3 |
* | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into maste... | Qt Continuous Integration System | 2011-04-29 | 2 | -3/+13 |
|\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge remote branch 'qt-fire-review/master' | aavit | 2011-04-28 | 2 | -3/+13 |
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |||||
| | * | | | | | | | Support more items for QTextCharFormat::VerticalAlignment enum for custom tex... | Dmitry Zelenkovsky | 2011-04-28 | 2 | -3/+13 |
* | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into maste... | Qt Continuous Integration System | 2011-04-28 | 34 | -406/+871 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | / / / / | |_|_|_|/ / / / |/| | | | | | | | |||||
| * | | | | | | | Merge remote branch 'qt-fire-review/master' | aavit | 2011-04-28 | 25 | -137/+249 |
| |\ \ \ \ \ \ \ | | |/ / / / / / | |||||
| | * | | | | | | Make QtQuick2 compile on QPA | Eskil Abrahamsen Blomfeldt | 2011-04-27 | 20 | -125/+199 |
| | * | | | | | | Use maximum ascent/descent/leading from fallback fonts in shaping | Jiang Jiang | 2011-04-27 | 6 | -8/+20 |
| | * | | | | | | Another ugly hack to make bidi cursor work with Core Text | Jiang Jiang | 2011-04-27 | 1 | -3/+24 |
| | * | | | | | | Make sure layoutData exist before checking for string direction | Jiang Jiang | 2011-04-27 | 1 | -0/+2 |
| | * | | | | | | Take leading space width into account for painting and selection | Jiang Jiang | 2011-04-26 | 2 | -1/+4 |
| * | | | | | | | Merge remote branch 'qt-mainline/master' | aavit | 2011-04-26 | 5 | -3/+13 |
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| / / / / / | | |/ / / / / | |||||
| * | | | | | | doc: Simplify language in QGlyphs docs | Eskil Abrahamsen Blomfeldt | 2011-04-22 | 1 | -2/+2 |
| * | | | | | | doc: Minor cleanup in QGlyphs docs | Eskil Abrahamsen Blomfeldt | 2011-04-21 | 1 | -1/+1 |
| * | | | | | | Remove extra comma at the end of enum list | Jiang Jiang | 2011-04-20 | 1 | -1/+1 |
| * | | | | | | Turn on HarfBuzz support for Mac/Cocoa | Jiang Jiang | 2011-04-19 | 2 | -1/+36 |
| * | | | | | | Support visual cursor movement for BIDI text | Jiang Jiang | 2011-04-19 | 10 | -266/+584 |
| * | | | | | | Long live QRawFont! | Eskil Abrahamsen Blomfeldt | 2011-04-15 | 31 | -339/+2620 |
| | |/ / / / | |/| | | | |