Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Made -graphicssystem trace work with Qt::TextBypassShaping flag. | Samuel Rødal | 2010-06-29 | 2 | -3/+3 |
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7-s60 | axis | 2010-06-24 | 1 | -1/+1 |
|\ | |||||
| * | Make QtFontFamily::symbol_checked a bitfield. | Andreas Kling | 2010-06-24 | 1 | -1/+1 |
* | | Don't crash when cleaning the uninitialized fontdatabase (Symbian) | Alessandro Portale | 2010-06-24 | 1 | -0/+2 |
|/ | |||||
* | Improve text performance with QtWebKit in Qt 4.7 | Simon Hausmann | 2010-06-23 | 1 | -1/+23 |
* | Fix a crash on exit. Destruction order in font database. (Symbian^4) | Alessandro Portale | 2010-06-22 | 1 | -6/+15 |
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ... | Qt Continuous Integration System | 2010-06-21 | 4 | -26/+30 |
|\ | |||||
| * | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7 | Andy Shaw | 2010-06-21 | 22 | -73/+202 |
| |\ | |||||
| | * | Fix compiler warnings in QtGui (text,painting). | Friedemann Kleint | 2010-06-21 | 2 | -6/+5 |
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7 | David Boddie | 2010-06-18 | 4 | -12/+15 |
| | |\ | |||||
| | * \ | Merge commit 'refs/merge-requests/691' of git://gitorious.org/qt/qt into inte... | David Boddie | 2010-06-18 | 1 | -20/+23 |
| | |\ \ | |||||
| | | * | | Documentation changes to QTextLayout. | Robin Burchell | 2010-06-15 | 1 | -20/+23 |
| * | | | | Make sure that <br/> is seen as a valid tag in Qt::mightBeRichText() | Andy Shaw | 2010-06-21 | 1 | -0/+2 |
* | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into qt-4.7-from-4.6 | Simon Hausmann | 2010-06-20 | 1 | -3/+11 |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | |||||
| * | | | | Fix possible crash in QTextLayout for glyphless items | Eskil Abrahamsen Blomfeldt | 2010-06-17 | 1 | -3/+11 |
* | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ... | Qt Continuous Integration System | 2010-06-17 | 1 | -4/+9 |
|\ \ \ \ \ | |||||
| * | | | | | Allocate the memory for QtFontSize when count > 1 | Benjamin Poulain | 2010-06-16 | 1 | -1/+1 |
| * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ... | Qt Continuous Integration System | 2010-06-16 | 1 | -4/+9 |
| |\ \ \ \ \ | | | |_|/ / | | |/| | | | |||||
| | * | | | | Reduce the memory consumption of QtFontStyle | Benjamin Poulain | 2010-06-16 | 1 | -4/+9 |
* | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ... | Qt Continuous Integration System | 2010-06-17 | 1 | -1/+2 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | |||||
| * | | | | | Fix crash on Mac OS X when drawing text with Qt::TextBypassShaping set | Tor Arne Vestbø | 2010-06-16 | 1 | -1/+2 |
| |/ / / / | |||||
* | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into qt-4.7-from-4.6 | Simon Hausmann | 2010-06-16 | 3 | -3/+11 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ... | Qt Continuous Integration System | 2010-06-16 | 3 | -3/+11 |
| |\ \ \ \ | |||||
| | * \ \ \ | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ... | Qt Continuous Integration System | 2010-06-15 | 3 | -3/+11 |
| | |\ \ \ \ | |||||
| | | * \ \ \ | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ... | Qt Continuous Integration System | 2010-06-15 | 3 | -3/+11 |
| | | |\ \ \ \ | |||||
| | | | * \ \ \ | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ... | Qt Continuous Integration System | 2010-06-12 | 3 | -3/+11 |
| | | | |\ \ \ \ | | | | | | |/ / | | | | | |/| / | | | | | |_|/ | | | | |/| | | |||||
| | | | | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ... | Qt Continuous Integration System | 2010-06-08 | 3 | -3/+12 |
| | | | | |\ \ | |||||
| | | | | | * | | Fix a freetype link failure. | Anders Bakken | 2010-06-08 | 1 | -1/+2 |
| | | | | | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ... | Qt Continuous Integration System | 2010-06-08 | 2 | -2/+10 |
| | | | | | |\ \ | |||||
| | | | | | | * | | Fix incorrect \since tag | Simon Hausmann | 2010-06-07 | 1 | -1/+1 |
| | | | | | | * | | Add convenience constructor to QTextOption::Tab | David Faure | 2010-06-04 | 2 | -2/+10 |
* | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into qt-4.7-from-4.6 | Simon Hausmann | 2010-06-16 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | |||||
| * | | | | | | | | Fix regression, remove artificial emboldening of monospaced fonts | Eskil Abrahamsen Blomfeldt | 2010-06-15 | 1 | -1/+1 |
| |/ / / / / / / | |||||
* | | | | | | | | Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration in... | Qt Continuous Integration System | 2010-06-15 | 2 | -10/+12 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | |||||
| * | | | | | | | Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration in... | Qt Continuous Integration System | 2010-06-14 | 2 | -10/+12 |
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | |||||
| | * | | | | | | Prospective S60 build fix | Simon Hausmann | 2010-06-13 | 2 | -4/+4 |
| | * | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into qt-4.7-from-4.6 | Simon Hausmann | 2010-06-13 | 1 | -6/+8 |
| | |\ \ \ \ \ \ | | | |/ / / / / | | |/| | | | / | | | | |_|_|/ | | | |/| | | | |||||
| | | * | | | | Thread safety for QFontEngineS60 | Shane Kearns | 2010-06-11 | 1 | -8/+10 |
* | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ... | Qt Continuous Integration System | 2010-06-15 | 3 | -6/+39 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | |||||
| * | | | | | | Add QTextOption API to QStaticText | Eskil Abrahamsen Blomfeldt | 2010-06-14 | 3 | -6/+39 |
| |/ / / / / | |||||
* | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration | Qt Continuous Integration System | 2010-06-12 | 3 | -0/+24 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | |||||
| * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration | Qt Continuous Integration System | 2010-06-10 | 3 | -0/+24 |
| |\ \ \ \ \ | |||||
| | * \ \ \ \ | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration | Qt Continuous Integration System | 2010-06-08 | 3 | -0/+24 |
| | |\ \ \ \ \ | | | |_|/ / / | | |/| | | | | |||||
| | | * | | | | Cursor positioning in QTextDocument after undo() | mae | 2010-06-08 | 3 | -0/+24 |
| | | | |/ / | | | |/| | | |||||
* | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ... | Qt Continuous Integration System | 2010-06-10 | 12 | -25/+87 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | |||||
| * | | | | | consistent handling of directionality in QTextLayout | Lars Knoll | 2010-06-09 | 3 | -15/+23 |
| * | | | | | correctly initialize the bidi level in the text engine | Lars Knoll | 2010-06-09 | 1 | -2/+15 |
| * | | | | | Use the textDirection() of blocks correctly. | Lars Knoll | 2010-06-09 | 4 | -14/+7 |
| * | | | | | Add QTextBlock::textDirection() | Lars Knoll | 2010-06-09 | 2 | -0/+45 |
| * | | | | | Make sure LayoutDirectionAuto is the default text direction | Lars Knoll | 2010-06-09 | 1 | -2/+5 |