summaryrefslogtreecommitdiffstats
path: root/src/gui/text
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7David Boddie2010-06-184-12/+15
|\
| * 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
| | |\
| * | \ 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/qt into qt-4.7-from-4.6Simon Hausmann2010-06-161-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 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
| | |_|/ / / / | |/| | | | |
* | | | | | | Reduce the memory consumption of QtFontStyleBenjamin Poulain2010-06-161-4/+9
| |_|_|_|_|/ |/| | | | |
* | | | | | 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
* | | | | | | | Fix regression, remove artificial emboldening of monospaced fontsEskil Abrahamsen Blomfeldt2010-06-151-1/+1
|/ / / / / / /
* | | | | | | 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
| |\ \ \ \ | | |/ / / | |/| | / | | | |/ | | |/|
| | * | Fix regression with Qt::AlignRight on monospaced text in QTextLayoutEskil Abrahamsen Blomfeldt2010-05-271-2/+2
| | * | Back port change d85b149a5c7f3532f8e1a593a79298c9ae38a95fEskil Abrahamsen Blomfeldt2010-05-272-0/+2
* | | | Problems with missing symbols on QWS/AIX. Include freetype synthesis file for...Toby Tomkins2010-06-101-0/+1
|/ / /
* | | Retrieve proper glyph outlines from Symbian^4Alessandro Portale2010-06-072-2/+103
| |/ |/|
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-06-041-29/+29
|\ \
| * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-06-041-29/+29
| |\ \
| | * | Ensure that we only have one QLayoutStruct struct by renaming the otherAndy Shaw2010-06-031-29/+29
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-06-042-3/+13
|\ \ \ \ | |/ / / |/| | |
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-06-032-3/+13
| |\ \ \ | | |/ / | |/| |
generated by cgit v0.12 at 2024-11-02 07:40:31 (GMT)