summaryrefslogtreecommitdiffstats
path: root/src/gui/text
Commit message (Expand)AuthorAgeFilesLines
* Merge remote branch 'origin/4.7' into 4.7Olivier Goffart2010-04-012-2/+6
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-03-312-3/+6
| |\
| | * Remove the "Insert unicode control character" menu entry on X11.Pierre Rossi2010-03-311-2/+2
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-03-301-1/+4
| | |\
| | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-03-301-1/+4
| | | |\
| | | | * Fix compile error with QT_NO_TEXTHTMLPARSER in QtGuiTasuku Suzuki2010-03-261-1/+4
| * | | | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2010-03-312-0/+4
| |\ \ \ \ | | |/ / / | |/| | |
| * | | | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2010-03-302-0/+10
| |\ \ \ \ | | |_|/ / | |/| | |
* | | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7David Boddie2010-03-3034-164/+1386
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Support the pen set on the painter in QStaticText when using rich textEskil Abrahamsen Blomfeldt2010-03-301-0/+5
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-03-307-106/+209
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7Eskil Abrahamsen Blomfeldt2010-03-291-24/+24
| | |\ \ \
| | | * | | Round instead of ceil font metrics when ForceIntegerMetrics is enabledTor Arne Vestbø2010-03-261-24/+24
| | * | | | Make QStaticText layout lazyEskil Abrahamsen Blomfeldt2010-03-293-28/+44
| | * | | | Change QStaticText::setMaximumSize() to setTextWidth()Eskil Abrahamsen Blomfeldt2010-03-293-44/+55
| | * | | | Respect QPainter::pen() in QPainter::drawStaticText()Eskil Abrahamsen Blomfeldt2010-03-291-3/+12
| | |/ / /
| | * | | Synchronize rich text and plain text code paths in QStaticTextEskil Abrahamsen Blomfeldt2010-03-261-2/+4
| | * | | Merge remote branch 'origin/4.7' into 4.7Olivier Goffart2010-03-253-10/+9
| | |\ \ \ | | | | |/ | | | |/|
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7Eskil Abrahamsen Blomfeldt2010-03-251-2/+2
| | |\ \ \
| | | * | | Fix QFontMetrics::height() and QFontMetrics autotestEskil Abrahamsen Blomfeldt2010-03-251-2/+2
| | * | | | Fix glyph advance on Mac/CarbonEskil Abrahamsen Blomfeldt2010-03-251-10/+43
| | |/ / /
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7Eskil Abrahamsen Blomfeldt2010-03-241-3/+2
| | |\ \ \
| | * | | | Add QFont::ForceIntegerMetrics style strategy flagEskil Abrahamsen Blomfeldt2010-03-243-21/+53
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7Martin Jones2010-03-253-10/+9
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| | * | | | Merge remote branch 'origin/4.7' into HEADThiago Macieira2010-03-241-3/+2
| | |\ \ \ \ | | | | |/ / | | | |/| |
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-03-233-10/+9
| | |\ \ \ \ | | | |_|/ / | | |/| | |
| | | * | | Make QStackTextEngine cheaper to constructAndreas Kling2010-03-221-5/+4
| | | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-03-222-5/+5
| | | |\ \ \
| | | | * | | Compile Qt in C++0x mode.Thiago Macieira2010-03-201-1/+1
| | | | * | | Merge remote branch 'origin/4.7' into oslo-staging-1Aaron McCarthy2010-03-193-5/+5
| | | | |\ \ \
| | | | * | | | Rename QTimestamp to QElapsedTimerThiago Macieira2010-03-171-3/+3
| | | | * | | | Port QtGui uses of QTime as a stopwatch to QTimestampThiago Macieira2010-03-171-4/+4
| * | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.7Alexis Menard2010-03-256-11/+60
| |\ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | |
| * | | | | | | compile fix for mingw (also removes some warnings)Thierry Bastian2010-03-231-3/+2
| | |/ / / / / | |/| | | | |
| * | | | | | Add new function QTextLine::horizontalAdvance()Eskil Abrahamsen Blomfeldt2010-03-232-0/+15
| | |/ / / / | |/| | | |
| * | | | | Merge branch '4.6-s60' into 4.7-s60axis2010-03-221-41/+82
| |\ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-03-173-5/+5
| |\ \ \ \ \ | | |_|_|/ / | |/| | | |
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-03-173-5/+5
| | |\ \ \ \
| | | * \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7-s60axis2010-03-161-1/+2
| | | |\ \ \ \
| | | * \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-publicaxis2010-03-154-7/+18
| | | |\ \ \ \ \
| | | * \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-publicaxis2010-03-117-58/+138
| | | |\ \ \ \ \ \
| | | * \ \ \ \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-publicaxis2010-03-014-9/+12
| | | |\ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-publicaxis2010-02-238-7/+913
| | | |\ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public into merge-w...axis2010-02-191-6/+13
| | | |\ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-publicaxis2010-02-167-31/+81
| | | |\ \ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into master-s60axis2010-02-163-4/+9
| | | | |\ \ \ \ \ \ \ \ \ \
| | | * | \ \ \ \ \ \ \ \ \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qtaxis2010-02-1210-39/+87
| | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / | | | | |/| | | | | | | | | |
| | | * | | | | | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-publicaxis2010-01-2193-158/+154
| | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-s60-publicaxis2009-12-1826-239/+324
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qtaxis2009-11-0624-181/+321
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
generated by cgit v0.12 at 2024-11-10 11:23:35 (GMT)