summaryrefslogtreecommitdiffstats
path: root/src/gui/text
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declar...Michael Brasser2009-06-243-18/+5
|\
| * More culling of Panther Code.Norwegian Rock Cat2009-06-231-12/+2
| * Merge branch '4.5' of scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-06-232-1/+3
| |\
| | * Remove some warnings in the Cocoa build.Norwegian Rock Cat2009-06-232-1/+3
| * | Merge commit 'origin/4.5'Oswald Buddenhagen2009-06-231-5/+0
| |\ \ | | |/
| | * Improve text drawing quality with CarbonSimon Hausmann2009-06-231-5/+0
* | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declar...Aaron Kennedy2009-06-1989-202/+199
|\ \ \ | |/ /
| * | Use QTransform more efficiently.Bjørn Erik Nilsen2009-06-181-6/+3
| * | Merge license header changes from 4.5Volker Hilsheimer2009-06-1689-178/+178
| |\ \ | | |/
| | * Update license headers as requested by the marketing department.Jason McDonald2009-06-1689-178/+178
| * | Merge commit 'origin/4.5'Bjørn Erik Nilsen2009-06-121-18/+18
| |\ \ | | |/
| | * Fixed a problem with disappearing borders in a QTextFrame.Trond Kjernåsen2009-06-111-18/+18
* | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declar...Michael Brasser2009-06-114-54/+47
|\ \ \ | |/ /
| * | Removed qApp and replaced with QApplication:: for static member callsThierry Bastian2009-06-112-19/+19
| * | refactor of private getters for the mode i item widget classesThierry Bastian2009-06-111-6/+4
| * | Makes the ODF writer use one text:tab tag for each tab, per ODF spec.Thomas Zander2009-06-111-28/+23
| * | removed superflous indirection (ie. using q->..) instead of using theThierry Bastian2009-06-101-1/+1
* | | Merge commit 'qt/master' into kinetic-declarativeuiBjørn Erik Nilsen2009-06-106-52/+4
|\ \ \ | |/ /
| * | small changes in private headersThierry Bastian2009-06-093-9/+2
| * | small improvement/refactor to cssparserThierry Bastian2009-06-092-42/+1
| * | small change to reduce static data sizeThierry Bastian2009-06-091-1/+1
* | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declar...Michael Brasser2009-06-097-18/+41
|\ \ \ | |/ /
| * | Merge commit 'origin/4.5'Oswald Buddenhagen2009-06-082-12/+15
| |\ \ | | |/
| | * Fixed text drawing on Windows in 16 bit mode.Trond Kjernaasen2009-06-052-13/+16
| * | Revert signal emission order in QTextDocument to 4.5 behaviourmae2009-06-082-3/+11
| * | Fix QT_NO_DATASTREAM macro checks and improve readabilityRitt Konstantin2009-06-082-0/+8
| * | Fixes anti-aliased text rendering on smartphones (Windows Mobile)Thomas Hartmann2009-06-051-2/+6
| * | All of Qt's own code compiles with -pedantic now (but pcre and webkit don't s...David Faure2009-06-041-1/+1
* | | Merge commit 'mainline/master' into kinetic-declarativeuiBjørn Erik Nilsen2009-06-042-9/+2
|\ \ \ | |/ /
| * | Merge branch '4.5'Denis Dzyubenko2009-06-022-9/+2
| |\ \ | | |/
| | * BT: Remove duplicate code and fix font parsing.Norwegian Rock Cat2009-06-022-9/+2
* | | Compilation fix on MSVCThierry Bastian2009-06-021-1/+1
|/ /
* | Integrate merge-request #548 into branch 'master'Norwegian Rock Cat2009-05-281-2/+0
|\ \
| * | Remove duplicate qpdf_p.h include.Brad Hards2009-05-281-2/+0
* | | oops, build was broken on embeddedThierry Bastian2009-05-281-1/+1
|/ /
* | improved string operations all over the placeThierry Bastian2009-05-286-26/+25
* | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-05-274-20/+23
|\ \ | |/
| * BT: Fixed GL textdrawing in the Boxes demo.Trond Kjernaasen2009-05-261-3/+3
| * Doc: Miscellaneous documentation fixes for Qt 4.5.x and later.David Boddie2009-05-251-6/+6
| * qdoc: Added some missing qdoc comments.Martin Smith2009-05-252-11/+14
* | Restore undo compression for cut/del of selectionsmae2009-05-271-25/+32
* | some cleanups on private exported symbolsThierry Bastian2009-05-264-11/+7
* | Fixed 'crazy' warnings about using a string instead of a characterThierry Bastian2009-05-257-23/+23
* | Merge branch '4.5'Thiago Macieira2009-05-222-15/+29
|\ \ | |/
| * Fixed potential bug caused by change b89efc8e7f32.Samuel Rødal2009-05-221-1/+1
| * Fixed text shaping bugs with ligatures and multiple font engines.Samuel Rødal2009-05-221-14/+26
| * Fixed an issue with text drawing to QImages on Mac/Cocoa.Trond Kjernåsen2009-05-221-1/+3
* | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-05-192-2/+2
|\ \ | |/
| * Fix some typos in the documentation.Frederik Schwarzer2009-05-182-2/+2
* | Merge commit 'origin/4.5'Olivier Goffart2009-05-181-7/+12
|\ \ | |/