summaryrefslogtreecommitdiffstats
path: root/src/gui/text
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into lighthouseJørgen Lind2010-08-039-29/+59
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | Fix crash when setting font decorations on text drawn with QStaticTextEskil Abrahamsen Blomfeldt2010-08-021-1/+6
| | | |/ / | | |/| |
| | * | | Merge remote branch 'origin/4.6' into 4.7-from-4.6Rohan McGovern2010-07-291-1/+4
| | |\ \ \ | | | | |/ | | | |/|
| | | * | Workaround for QTBUG-8013: Do not return an ascent of 0Alessandro Portale2010-07-271-1/+4
* | | | | Merge remote branch 'qt/master' into lighthouse-masterPaul Olav Tvete2010-08-0412-32/+96
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Add QTextFragment::glyphs() accessorEskil Abrahamsen Blomfeldt2010-08-024-4/+46
| * | | | Minor optimizationSimon Hausmann2010-07-301-1/+1
| * | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-07-289-27/+49
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-07-212-4/+2
| | |\ \ \
| | | * | | doc: Fix qdoc errors for text related filesEskil Abrahamsen Blomfeldt2010-07-202-4/+2
| | * | | | Merge branch 'raptorConfigurePatches' into 4.7-s60axis2010-07-211-2/+0
| | |\ \ \ \ | | | |/ / / | | |/| | |
| | | * | | Fixed QT_NO_FREETYPE define.axis2010-07-211-2/+0
| | * | | | Remove qMemCopy() usage from all .cpp files of Qt itself.Robin Burchell2010-07-183-9/+9
| | * | | | Merge remote branch 'origin/4.7' into 4.7-from-4.6Rohan McGovern2010-07-174-9/+34
| | |\ \ \ \
| | | * \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-07-161-1/+1
| | | |\ \ \ \
| | | | * | | | Fix RightBearing confusion in text layoutmae2010-07-161-1/+1
| | | | |/ / /
| | | * | | | Fix an Assert in QTextTablePierre Rossi2010-07-141-4/+24
| | | * | | | Revert "Fix an Assert in QTextTable"Aaron McCarthy2010-07-141-24/+4
| | | * | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-07-131-4/+24
| | | |\ \ \ \
| | | | * | | | Fix an Assert in QTextTablePierre Rossi2010-07-131-4/+24
| | | * | | | | doc: Fixed several qdoc warnings.Martin Smith2010-07-131-3/+3
| | | |/ / / /
| | | * | | | Fixing merge conflicts.Martin Smith2010-07-136-27/+46
| | | |\ \ \ \ | | | | |/ / /
| | | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-07-101-1/+6
| | | |\ \ \ \
| | | | * | | | doc: Fixed several qdoc warnings.Martin Smith2010-07-091-1/+6
| | * | | | | | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2010-07-151-3/+4
| | |\ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | / | | | | |_|_|/ | | | |/| | |
| | | * | | | Fix crash when removing columns in merged rowEskil Abrahamsen Blomfeldt2010-07-071-3/+4
* | | | | | | Merge remote branch 'remotes/lighthouse/4.7' into lighthouse-masterPaul Olav Tvete2010-07-199-28/+79
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | / | | |_|_|_|/ | |/| | | |
| * | | | | Merge remote branch 'qt/4.7' into lighthouse-4.7Paul Olav Tvete2010-07-1415-31/+85
| |\ \ \ \ \ | | |/ / / /
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into lighthouseJørgen Lind2010-06-247-37/+80
| |\ \ \ \ \
| * | | | | | Adding -qpa configure switchJørgen Lind2010-06-241-2/+2
| * | | | | | Renamed files from *_lite* to *_qpa*Jørgen Lind2010-06-241-1/+1
| * | | | | | Say hello to Q_WS_QPA!Jørgen Lind2010-06-247-30/+30
| * | | | | | Merge remote branch 'qt/4.7' into lighthousePaul Olav Tvete2010-06-1833-226/+745
| |\ \ \ \ \ \
| * | | | | | | Say hello to Qt for Native Client.Morten Johan Sørvig2010-05-141-0/+2
| * | | | | | | Merge remote branch 'qt/4.7' into lighthouse-4.7Paul Olav Tvete2010-05-109-101/+110
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge remote branch 'origin/4.7' into lighthouseJørgen Lind2010-04-2127-203/+495
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Renamed createWindowSurfaceForWindowJørgen Lind2010-04-211-8/+20
| * | | | | | | | | QPlatformScreen now has default implementation for physicalSizeJørgen Lind2010-04-191-2/+12
| * | | | | | | | | Merge remote branch 'qt/4.7' into lighthouse-4.7Paul Olav Tvete2010-03-1810-20/+85
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge remote branch 'origin/4.7' into 4.7-lighthouseJørgen Lind2010-03-118-59/+139
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge remote branch 'qt/4.7' into lighthouse-4.7Paul Olav Tvete2010-03-0121-50/+1021
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge remote branch 'remotes/qt/4.6' into lighthousePaul Olav Tvete2010-02-109-36/+87
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge remote branch 'origin/4.6' into lighthousePaul Olav Tvete2010-01-1493-339/+306
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote branch 'origin/4.6' into lighthousePaul Olav Tvete2009-11-1936-339/+560
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch '4.6' into lighthousePaul Olav Tvete2009-10-149-24/+50
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch '4.6' into lighthousePaul Olav Tvete2009-09-3093-496/+705
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | Please welcome the Lighthouse Research Project!Paul Olav Tvete2009-09-079-28/+55
* | | | | | | | | | | | | | | | | | Merge remote branch 'origin/master' into qt-master-from-4.7Thiago Macieira2010-07-151-10/+31
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | Support RTL text in QGlyphsEskil Abrahamsen Blomfeldt2010-07-141-1/+4
| * | | | | | | | | | | | | | | | | | Support text decoration in QPainter::drawGlyphs()Eskil Abrahamsen Blomfeldt2010-07-141-9/+27
generated by cgit v0.12 at 2025-02-18 18:00:30 (GMT)