summaryrefslogtreecommitdiffstats
path: root/src/gui/text
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2011-04-211-5/+12
|\
| * Merge remote-tracking branch 'mainline/master'Oswald Buddenhagen2011-04-2133-341/+2622
| |\
| * | Use binary search to speed up findChildFrame()Steffen Hansen2011-04-211-5/+12
* | | Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration...Qt Continuous Integration System2011-04-201-0/+3
|\ \ \ | |_|/ |/| |
| * | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-04-181-0/+3
| |\ \
| | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-04-131-0/+3
| | |\ \
| | | * | Fix TextEdit cursorRectangle property.Andrew den Exter2011-04-131-0/+3
* | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into maste...Qt Continuous Integration System2011-04-1931-339/+2620
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Long live QRawFont!Eskil Abrahamsen Blomfeldt2011-04-1931-339/+2620
* | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into mast...Qt Continuous Integration System2011-04-182-2/+2
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt into earth-masteraxis2011-04-0713-123/+18
| |\ \ \ \ | | |/ / /
| * | | | Make sure we don't use subpixel positions in full hinting modeJiang Jiang2011-04-011-0/+2
| * | | | Compile with QStringBuilder and QByteArrayOlivier Goffart2011-04-011-1/+1
| * | | | Chnaged Q_AUTOTEST_EXPORT marco into Q_GUI_EXPORT for QZipWriter classPavel Mogilevskiy2011-04-011-1/+1
| * | | | Fix horizontal centered text drawing without word wrapJiang Jiang2011-04-013-18/+18
* | | | | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2011-04-123-1/+11
|\ \ \ \ \ | |_|/ / / |/| | / / | | |/ / | |/| |
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2011-04-113-1/+11
| |\ \ \
| | * | | Make sure removed QTextBlock is invalidJiang Jiang2011-04-113-1/+11
| * | | | Merge remote-tracking branch 'mainline/4.7' into 4.7Oswald Buddenhagen2011-03-313-3/+6
| |\ \ \ \
| * | | | | Ensure the right font is used for rendering text on MacAndy Shaw2011-03-301-1/+3
* | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into maste...Qt Continuous Integration System2011-04-0611-122/+15
|\ \ \ \ \ \
| * | | | | | Put all the declarations of qt_defaultDpi{,X,Y}() in one placeJiang Jiang2011-04-058-16/+5
| * | | | | | Fix positioning in GL2 paint engine with subpixel antialiasingJiang Jiang2011-04-043-106/+10
* | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2011-04-051-0/+2
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Add version attributes as per ODF specificationTomas Straupis2011-03-291-0/+2
* | | | | | | Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration...Qt Continuous Integration System2011-04-031-1/+1
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-03-311-1/+1
| |\ \ \ \ \ \ \ | | | |_|/ / / / | | |/| | | / / | | |_|_|_|/ / | |/| | | | |
| | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-03-281-1/+1
| | |\ \ \ \ \ | | | |_|_|/ / | | |/| | | / | | | | |_|/ | | | |/| |
| | | * | | Fix text selection with shift-click.Andrew den Exter2011-03-281-1/+1
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2011-03-251-1/+4
| | |\ \ \ \
| | | * | | | Make sure num_glyphs pass to HarfBuzz is large enoughJiang Jiang2011-03-241-1/+4
* | | | | | | Make sure we don't use subpixel positions in full hinting modeJiang Jiang2011-04-011-0/+2
* | | | | | | Fix horizontal centered text drawing without word wrapJiang Jiang2011-03-313-18/+18
|/ / / / / /
* | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into maste...Qt Continuous Integration System2011-03-285-96/+158
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Fix crash and infinite recursion caused by previous commitsJiang Jiang2011-03-282-2/+3
| * | | | | Fix remaining regressions in QWSJiang Jiang2011-03-252-0/+2
| * | | | | Take Xft.hintstyle by default to match the behavior of GTK+Jiang Jiang2011-03-251-1/+6
| * | | | | Fixed remaining issues in subpixel positioning with FreeTypeJiang Jiang2011-03-242-10/+10
| * | | | | unlockFace was put in the wrong place in previous patchJiang Jiang2011-03-221-2/+2
| * | | | | Implement subpixel positioning with FreeTypeJiang Jiang2011-03-224-95/+149
* | | | | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-03-221-1/+1
|\ \ \ \ \ \ | |/ / / / / |/| / / / / | |/ / / /
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2011-03-211-1/+1
| |\ \ \ \ | | |/ / / | | | | / | | |_|/ | |/| |
| | * | Don't crash calling QTextDocument::blockBoundingRect on invalid blockEskil Abrahamsen Blomfeldt2011-03-211-1/+1
* | | | Merge remote branch 'qt/master' into staging-masterSamuel Rødal2011-03-212-23/+26
|\ \ \ \
| * \ \ \ Merge remote-tracking branch 'origin/master' into lighthouse-masterJørgen Lind2011-03-1715-41/+54
| |\ \ \ \
| | * \ \ \ Merge remote-tracking branch 'origin/4.7' into HEADThiago Macieira2011-03-161-22/+25
| | |\ \ \ \ | | | |/ / /
| | | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2011-03-151-22/+25
| | | |\ \ \ | | | | |/ /
| | | | * | Adjust right bearing when breaking with line separatorsJiang Jiang2011-03-151-22/+25
| * | | | | don't print debug outputcon2011-03-041-1/+1
* | | | | | Only enable RightToLeft forcing in OS X 10.6 and skip the testJiang Jiang2011-03-161-0/+2