summaryrefslogtreecommitdiffstats
path: root/src/gui/text
Commit message (Expand)AuthorAgeFilesLines
* Merge commit 'qt/master-stable'Jason Barron2009-08-049-34/+95
|\
| * Merge branch '4.5'Thiago Macieira2009-08-031-3/+6
| |\
| | * Mac: Fix crash in QCoreTextFontEngineMulti when disabling font kerning.Morten Sørvig2009-07-301-1/+1
| | * Fix crash when printing to PDF on Qt/MacMorten Sørvig2009-07-271-2/+5
| * | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtAaron Kennedy2009-07-311-2/+2
| |\ \
| | * | Don't do two hash lookups in loadGlyphs()Eskil Abrahamsen Blomfeldt2009-07-301-2/+2
| * | | Export QTextControlAaron Kennedy2009-07-311-1/+1
| |/ /
| * | Port of Qt to QNXHarald Fernengel2009-07-292-9/+49
| * | Port of Qt to VxWorksRobert Griebl2009-07-294-19/+37
* | | Merge commit 'qt/master-stable'Jason Barron2009-07-301-29/+72
|\ \ \ | |/ /
| * | Doc: Document the purpose of the QTextFormat etc enums, and add a few linksVolker Hilsheimer2009-07-281-29/+72
* | | Merge commit 'qt/master-stable'Jason Barron2009-07-291-7/+5
|\ \ \ | |/ /
| * | Doc: QTextLayout is the class to use in interactive text controls.Volker Hilsheimer2009-07-271-1/+1
| * | Doc: QTextLayout is the class to use in interactive text controls.Volker Hilsheimer2009-07-271-6/+4
* | | Merge commit 'qt/master-stable'Jason Barron2009-07-282-4/+1
|\ \ \ | |/ /
| * | Doc: Replace links to obsolete APIs.Volker Hilsheimer2009-07-251-2/+0
| * | Reverted commits that changed the behavior of the keypresses with modifiers.Denis Dzyubenko2009-07-231-2/+1
* | | Merge commit 'qt/master-stable'Jason Barron2009-07-2722-597/+326
|\ \ \ | |/ /
| * | Doc: A few cleanups, fixes and improvements.Volker Hilsheimer2009-07-191-2/+2
| * | Doc: add \since 4.6 for new APIsVolker Hilsheimer2009-07-192-0/+3
| * | fix warnings with mingwThierry Bastian2009-07-151-0/+2
| * | Fix warnings for mingwThierry Bastian2009-07-152-16/+16
| * | Added QTextListFormat::ListUpperRoman and QTextListFormat::ListLowerRoman for...Nils Jeisecke2009-07-139-7/+85
| * | Unified common code in QSyntaxHighlighter::rehighlight() and QSyntaxHighlight...J-P Nurmi2009-07-131-17/+14
| * | Added QSyntaxHighlighter::rehighlightBlock(QTextBlock)J-P Nurmi2009-07-132-0/+28
| * | Don't insert text into a text widget when a modifier is pressed.Denis Dzyubenko2009-07-021-1/+2
| * | Port gui/embedded to the EINTR-safe functions.Thiago Macieira2009-07-023-9/+12
| * | src/gui: Remove QT_WA and non-Unicode code paths, dropping Win9x and NT supportminiak2009-07-014-554/+171
* | | Make S60 integration optional.Jason Barron2009-07-157-33/+33
* | | Merge commit 'origin/master' into 4.6-mergedJason Barron2009-07-092-4/+1
|\ \ \
| * | | Removed unused static data from Qt.axis2009-07-061-2/+0
| * | | Removed pointless variables to silence warnings from RVCT.axis2009-07-061-2/+1
| * | | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtaxis2009-06-2989-203/+201
| |\ \ \ | | | |/ | | |/|
* | | | Change the inclusion method here to use system includes.Jason Barron2009-07-081-1/+1
* | | | 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