summaryrefslogtreecommitdiffstats
path: root/src/gui/text
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into master-integra...Qt Continuous Integration System2010-02-122-5/+7
|\
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into master-integra...Qt Continuous Integration System2010-02-112-5/+7
| |\
| | * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into master-integra...Qt Continuous Integration System2010-02-102-5/+7
| | |\
| | | * A little optimization in QTextControlPrivate::setContent.Alexis Menard2010-02-091-3/+5
| | | * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into master-integra...Qt Continuous Integration System2010-02-051-2/+2
| | | |\
| | | | * Merge branch 'kinetic-declarativeui' of git://git-nokia.trolltech.com.au/qtso...Warwick Allison2010-02-041-2/+2
| | | | |\
| | | | | * Merge branch '4.6' of git://scm.dev.nokia.troll.no/qt/qt into kinetic-declara...Warwick Allison2010-02-022-3/+5
| | | | | |\
| | | | | * | Fix tst_qmlgraphicstext::letterSpacing tst_qmlgraphicstext::wordSpacingWarwick Allison2010-01-141-1/+9
| | | | | * | Merge branch '4.6' of git://scm.dev.nokia.troll.no/qt/qt into kinetic-declara...Warwick Allison2010-01-1493-156/+140
| | | | | |\ \
| | | | | * | | Compile fix for QMLViewerThomas Hartmann2010-01-081-2/+2
* | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into mast...Qt Continuous Integration System2010-02-111-3/+2
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Fixed cleaning of both undo- and redo-stacks.Erik Verbruggen2010-02-111-3/+2
* | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-02-111-2/+2
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Crash when deleting the parent of a context menu while it is being displayedGabriel de Dietrich2010-02-101-2/+2
| |/ / / / / /
* | | | | | | Fixed regression.Erik Verbruggen2010-02-101-4/+4
* | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into mast...Qt Continuous Integration System2010-02-104-22/+67
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Added method to clear the undo/redo stacks.Erik Verbruggen2010-02-094-22/+67
| |/ / / / /
* | | | | | Merge remote branch 'qt/4.6' into qt-master-from-4.6Qt Continuous Integration System2010-02-094-11/+13
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-02-061-6/+5
| |\ \ \ \ \
| | * | | | | Fixed casual crash in initializeDb (Symbian)Alessandro Portale2010-02-051-6/+5
| * | | | | | Make sure we define S_IFDIR on WindowsThomas Zander2010-02-041-3/+6
| * | | | | | Fix copy/pastoThomas Zander2010-02-042-2/+2
| |/ / / / /
* | | | | | Merge remote branch 'origin/4.6' into qt-master-from-4.6Olivier Goffart2010-02-042-21/+60
|\ \ \ \ \ \ | |/ / / / / | | / / / / | |/ / / / |/| | | |
| * | | | Fixed text rendering via scaled QPainter on rasterPaintEngine / SymbianAlessandro Portale2010-02-012-18/+60
| * | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-01-281-3/+0
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | Remove left over forward declarationsAlessandro Portale2010-01-281-3/+0
* | | | | Merge remote branch 'qt/4.6' into qt-master-from-4.6Qt Continuous Integration System2010-02-012-3/+5
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-01-281-0/+5
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | doc: Specified default values for constructors.Martin Smith2010-01-271-0/+5
| * | | | Removing unneeded code from QFontEngine::getGlyphPositions()Alessandro Portale2010-01-271-3/+0
| |/ / /
* | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into mas...Pulse Build System2010-01-222-2/+2
|\ \ \ \
| * \ \ \ Merge branch 'merge-request-1601' into master-s60axis2010-01-053-4/+4
| |\ \ \ \
| | * | | | Make all Symbian #includes lower case.Anderson Lizardo2009-10-233-4/+4
* | | | | | Merge branch '4.6'Thiago Macieira2010-01-181-1/+9
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | Fix tst_qmlgraphicstext::letterSpacing tst_qmlgraphicstext::wordSpacing Sent ...Warwick Allison2010-01-141-1/+9
| | |_|_|/ | |/| | |
* | | | | Merge branch '4.6'Thiago Macieira2010-01-1393-95/+94
|\ \ \ \ \ | |/ / / /
| * | | | Merge remote branch 'qt/4.6' into oslo-staging-2/4.6Paul Olav Tvete2010-01-1293-125/+100
| |\ \ \ \
| | * \ \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-01-1293-93/+93
| | |\ \ \ \
| | | * \ \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-01-0793-93/+93
| | | |\ \ \ \
| | | | * | | | Update copyright year to 2010Jason McDonald2010-01-0693-93/+93
| * | | | | | | fix release mode crash in qfont.cpp initFontSubst() on Windows mobileJoerg Bornemann2010-01-111-2/+1
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch '4.6'Thiago Macieira2010-01-122-32/+7
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Fix for QTBUG-6408 QFontEngineS60::QFontEngineS60 called hundreds ofJani Hautakangas2010-01-112-32/+7
| |/ / / / /
* | | | | | Merge branch '4.6'Thiago Macieira2010-01-082-29/+39
|\ \ \ \ \ \ | |/ / / / / | | | / / / | |_|/ / / |/| | | |
| * | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-01-061-3/+10
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Don't write out fo:word-spacing if its the default value.Thomas Zander2010-01-061-2/+2
| | * | | Fix background brush for character format when writing to ODF document.Pierre Rossi2009-12-301-1/+8
| | | |/ | | |/|
| * | | doc: Fixed references to currsor position().Martin Smith2010-01-061-26/+29
| |/ /
* | | Merge branch '4.6'Thiago Macieira2009-12-263-10/+18
|\ \ \ | |/ /
| * | Edit focus should not be lost unless by explicit actionSami Merila2009-12-211-1/+5
generated by cgit v0.12 at 2024-11-12 02:43:25 (GMT)