summaryrefslogtreecommitdiffstats
path: root/src/gui/text
Commit message (Expand)AuthorAgeFilesLines
* Make QtFontFamily::symbol_checked a bitfield.Andreas Kling2010-06-241-1/+1
* Improve text performance with QtWebKit in Qt 4.7Simon Hausmann2010-06-231-1/+23
* Fix a crash on exit. Destruction order in font database. (Symbian^4)Alessandro Portale2010-06-221-6/+15
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-06-214-26/+30
|\
| * Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Andy Shaw2010-06-2122-73/+202
| |\
| | * Fix compiler warnings in QtGui (text,painting).Friedemann Kleint2010-06-212-6/+5
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7David Boddie2010-06-184-12/+15
| | |\
| | * \ Merge commit 'refs/merge-requests/691' of git://gitorious.org/qt/qt into inte...David Boddie2010-06-181-20/+23
| | |\ \
| | | * | Documentation changes to QTextLayout.Robin Burchell2010-06-151-20/+23
| * | | | Make sure that <br/> is seen as a valid tag in Qt::mightBeRichText()Andy Shaw2010-06-211-0/+2
* | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into qt-4.7-from-4.6Simon Hausmann2010-06-201-3/+11
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Fix possible crash in QTextLayout for glyphless itemsEskil Abrahamsen Blomfeldt2010-06-171-3/+11
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-06-171-4/+9
|\ \ \ \ \
| * | | | | Allocate the memory for QtFontSize when count > 1Benjamin Poulain2010-06-161-1/+1
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-06-161-4/+9
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| | * | | | Reduce the memory consumption of QtFontStyleBenjamin Poulain2010-06-161-4/+9
* | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-06-171-1/+2
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Fix crash on Mac OS X when drawing text with Qt::TextBypassShaping setTor Arne Vestbø2010-06-161-1/+2
| |/ / / /
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into qt-4.7-from-4.6Simon Hausmann2010-06-163-3/+11
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-06-163-3/+11
| |\ \ \ \
| | * \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-06-153-3/+11
| | |\ \ \ \
| | | * \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-06-153-3/+11
| | | |\ \ \ \
| | | | * \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-06-123-3/+11
| | | | |\ \ \ \ | | | | | | |/ / | | | | | |/| / | | | | | |_|/ | | | | |/| |
| | | | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-06-083-3/+12
| | | | | |\ \
| | | | | | * | Fix a freetype link failure.Anders Bakken2010-06-081-1/+2
| | | | | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-06-082-2/+10
| | | | | | |\ \
| | | | | | | * | Fix incorrect \since tagSimon Hausmann2010-06-071-1/+1
| | | | | | | * | Add convenience constructor to QTextOption::TabDavid Faure2010-06-042-2/+10
* | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into qt-4.7-from-4.6Simon Hausmann2010-06-161-1/+1
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Fix regression, remove artificial emboldening of monospaced fontsEskil Abrahamsen Blomfeldt2010-06-151-1/+1
| |/ / / / / / /
* | | | | | | | Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2010-06-152-10/+12
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2010-06-142-10/+12
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| | * | | | | | Prospective S60 build fixSimon Hausmann2010-06-132-4/+4
| | * | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into qt-4.7-from-4.6Simon Hausmann2010-06-131-6/+8
| | |\ \ \ \ \ \ | | | |/ / / / / | | |/| | | | / | | | | |_|_|/ | | | |/| | |
| | | * | | | Thread safety for QFontEngineS60Shane Kearns2010-06-111-8/+10
* | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-06-153-6/+39
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Add QTextOption API to QStaticTextEskil Abrahamsen Blomfeldt2010-06-143-6/+39
| |/ / / / /
* | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-06-123-0/+24
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-06-103-0/+24
| |\ \ \ \ \
| | * \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-06-083-0/+24
| | |\ \ \ \ \ | | | |_|/ / / | | |/| | | |
| | | * | | | Cursor positioning in QTextDocument after undo()mae2010-06-083-0/+24
| | | | |/ / | | | |/| |
* | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-06-1012-25/+87
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | consistent handling of directionality in QTextLayoutLars Knoll2010-06-093-15/+23
| * | | | | correctly initialize the bidi level in the text engineLars Knoll2010-06-091-2/+15
| * | | | | Use the textDirection() of blocks correctly.Lars Knoll2010-06-094-14/+7
| * | | | | Add QTextBlock::textDirection()Lars Knoll2010-06-092-0/+45
| * | | | | Make sure LayoutDirectionAuto is the default text directionLars Knoll2010-06-091-2/+5
| * | | | | The default text direction for QTextOption is Qt::LayoutDirectionAutoLars Knoll2010-06-092-3/+3
| |/ / / /
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Toby Tomkins2010-06-101-2/+2
|\ \ \ \ \ | |/ / / /
| * | | | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Olivier Goffart2010-06-081-2/+2
| |\ \ \ \ | | |/ / / | |/| / / | | |/ /
generated by cgit v0.12 at 2024-09-25 16:28:08 (GMT)