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...Aaron Kennedy2009-07-236-18/+23
|\
| * 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
* | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declar...Michael Brasser2009-07-1511-15/+118
|\ \ | |/
| * 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
* | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declar...Michael Brasser2009-07-104-10/+14
|\ \ | |/
| * 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
* | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declar...Michael Brasser2009-07-026-555/+173
|\ \ | |/
| * src/gui: Remove QT_WA and non-Unicode code paths, dropping Win9x and NT supportminiak2009-07-014-554/+171
| * 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
* | | 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
|/ /