summaryrefslogtreecommitdiffstats
path: root/src/gui/text
Commit message (Expand)AuthorAgeFilesLines
* Merge commit 'qt/master-stable' into 4.6-mergedJason Barron2009-06-3089-203/+188
|\
| * Merge branch '4.5'Thiago Macieira2009-06-241-0/+1
| |\
| | * Compile.Norwegian Rock Cat2009-06-231-1/+1
| | * Recognize | as separator characterThorbjørn Lindeijer2009-06-231-0/+1
| * | Remove these colorspace references.Norwegian Rock Cat2009-06-241-1/+1
| * | 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
| * | 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 'qt/master-stable' into 4.6-stableJason Barron2009-06-2530-320/+354
|\ \ \ | |/ /
| * | 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
| * | 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
| * | 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 commit 'origin/4.5'Oswald Buddenhagen2009-06-082-12/+15
| |\ \ | | |/
| * | 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 branch '4.5'Denis Dzyubenko2009-06-022-9/+2
| |\ \
| * \ \ 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
| |\ \ \
| * | | | 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
| |\ \ \ \
| * \ \ \ \ Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-05-192-2/+2
| |\ \ \ \ \
| * \ \ \ \ \ Merge commit 'origin/4.5'Olivier Goffart2009-05-181-7/+12
| |\ \ \ \ \ \
| * | | | | | | Fix compilation of the cssparser testOlivier Goffart2009-05-181-3/+3
| * | | | | | | Merge branch '4.5'Thiago Macieira2009-05-141-3/+3
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge commit 'origin/4.5'Olivier Goffart2009-05-131-1/+1
| |\ \ \ \ \ \ \ \
| * | | | | | | | | compilation fix for LinuxThierry Bastian2009-05-111-1/+1
| * | | | | | | | | Merge branch '4.5'Thiago Macieira2009-05-111-1/+6
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | Almost 200 symbols that didn't need to be exported.Thierry Bastian2009-05-111-1/+1
| * | | | | | | | | | Merge branch '4.5'Thiago Macieira2009-05-112-21/+38
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | removing additional unused export to classes only used in QtGuiThierry Bastian2009-05-081-4/+4
| * | | | | | | | | | | Do not export inline private classes in qcssparser_p.hThierry Bastian2009-05-081-7/+7
| * | | | | | | | | | | Fixed unwanted merging of undo commands from different edit blocksmae2009-05-083-20/+47