summaryrefslogtreecommitdiffstats
path: root/src/gui/text
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2011-05-174-9/+10
|\
| * Merge branch 4.7 into qt-4.8-from-4.7Qt Continuous Integration System2011-05-131-1/+1
| |\
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-05-131-1/+1
| | |\
| | | * Make TextEdit word selection more natural.Andrew den Exter2011-05-131-1/+1
| * | | Merge branch 4.7 into qt-4.8-from-4.7Qt Continuous Integration System2011-05-121-1/+3
| |\ \ \ | | |/ /
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-05-121-1/+3
| | |\ \ | | | |/
| | | * Ensure the TextEdit cursor delegate is repositioned on mouse events.Andrew den Exter2011-05-121-1/+3
| | | * Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt into 4.7Martin Jones2011-04-279-52/+76
| | | |\
| * | | \ Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7Olivier Goffart2011-05-063-7/+6
| |\ \ \ \ | | |/ / /
| | * | | memory leak fixTero Toivola2011-05-031-0/+4
| | * | | Revert symbol addition in b033bb9Jiang Jiang2011-04-292-7/+2
* | | | | Move QTextCursor::MoveStyle to Qt namespaceJiang Jiang2011-05-119-31/+27
* | | | | Add some QRawFont related low level functions to avoid extra copyingJiang Jiang2011-05-102-5/+55
* | | | | Compile on MacEskil Abrahamsen Blomfeldt2011-05-101-2/+2
* | | | | Rename QGlyphs -> QGlyphRunEskil Abrahamsen Blomfeldt2011-05-109-120/+121
* | | | | Fix QRawFont::setPixelSize() on MacEskil Abrahamsen Blomfeldt2011-05-061-1/+1
* | | | | Merge remote branch 'qt-mainline/4.8'aavit2011-05-063-13/+20
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into maste...Qt Continuous Integration System2011-05-056-107/+65
| |\ \ \ \
| * \ \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into ma...Qt Continuous Integration System2011-05-051-11/+19
| |\ \ \ \ \
| | * \ \ \ \ Merge remote-tracking branch 'qt/4.8'Sami Lempinen2011-04-2836-357/+2654
| | |\ \ \ \ \
| | * | | | | | Make text rendering working outside the gui thread on Symbian.Laszlo Agocs2011-04-261-11/+19
| * | | | | | | Merge earth-team into origin/4.8Olivier Goffart2011-05-0337-424/+905
| |\ \ \ \ \ \ \
| * | | | | | | | Fixes warnings about unused variablesOlivier Goffart2011-04-282-2/+1
* | | | | | | | | Only enable design metrics for scalable fontsJiang Jiang2011-05-051-1/+1
* | | | | | | | | Add a way to retrieve CTFontRef from QFontJiang Jiang2011-05-052-3/+6
* | | | | | | | | Include pixel size of font in exported HTML from QTextDocumentEskil Abrahamsen Blomfeldt2011-05-041-0/+8
| |_|_|_|/ / / / |/| | | | | | |
* | | | | | | | Remove QFontEngineFT::loadGlyphMetricsJiang Jiang2011-05-032-101/+0
* | | | | | | | Add required font metrics functions to QRawFontJiang Jiang2011-05-022-0/+56
* | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-teamaavit2011-05-024-6/+9
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | Make pixel size a qreal in QRawFontEskil Abrahamsen Blomfeldt2011-05-022-5/+5
| * | | | | | | Make sure removed QTextBlock is invalidJiang Jiang2011-04-293-1/+11
| * | | | | | | Make sure QFont's resolve mask is copied on compilers with C++0x supportEskil Abrahamsen Blomfeldt2011-04-291-1/+1
| * | | | | | | Fix glyph position issue with fallback fontsJiang Jiang2011-04-291-0/+3
* | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into maste...Qt Continuous Integration System2011-04-292-3/+13
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge remote branch 'qt-fire-review/master'aavit2011-04-282-3/+13
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | Support more items for QTextCharFormat::VerticalAlignment enum for custom tex...Dmitry Zelenkovsky2011-04-282-3/+13
* | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into maste...Qt Continuous Integration System2011-04-2834-406/+871
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | / / / / | |_|_|_|/ / / / |/| | | | | | |
| * | | | | | | Merge remote branch 'qt-fire-review/master'aavit2011-04-2825-137/+249
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Make QtQuick2 compile on QPAEskil Abrahamsen Blomfeldt2011-04-2720-125/+199
| | * | | | | | Use maximum ascent/descent/leading from fallback fonts in shapingJiang Jiang2011-04-276-8/+20
| | * | | | | | Another ugly hack to make bidi cursor work with Core TextJiang Jiang2011-04-271-3/+24
| | * | | | | | Make sure layoutData exist before checking for string directionJiang Jiang2011-04-271-0/+2
| | * | | | | | Take leading space width into account for painting and selectionJiang Jiang2011-04-262-1/+4
| * | | | | | | Merge remote branch 'qt-mainline/master'aavit2011-04-265-3/+13
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| / / / / / | | |/ / / / /
| * | | | | | doc: Simplify language in QGlyphs docsEskil Abrahamsen Blomfeldt2011-04-221-2/+2
| * | | | | | doc: Minor cleanup in QGlyphs docsEskil Abrahamsen Blomfeldt2011-04-211-1/+1
| * | | | | | Remove extra comma at the end of enum listJiang Jiang2011-04-201-1/+1
| * | | | | | Turn on HarfBuzz support for Mac/CocoaJiang Jiang2011-04-192-1/+36
| * | | | | | Support visual cursor movement for BIDI textJiang Jiang2011-04-1910-266/+584
| * | | | | | Long live QRawFont!Eskil Abrahamsen Blomfeldt2011-04-1531-339/+2620
| | |/ / / / | |/| | | |