summaryrefslogtreecommitdiffstats
path: root/src/gui/text
Commit message (Expand)AuthorAgeFilesLines
* Merge remote branch 'origin/4.7' into HEADOlivier Goffart2010-05-192-0/+4
|\
| * Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Olivier Goffart2010-05-172-0/+4
| |\
| | * Support linked fonts (.ltt) from standard font locations.Alessandro Portale2010-05-141-0/+1
| | * Fixed QFont to respect the italics constructor flag.Trond Kjernåsen2010-05-121-0/+3
* | | Make sure cursorPositionChanged is emitted when doing undo/redoThorbjørn Lindeijer2010-05-181-0/+8
|/ /
* | Use case-insensitive comparison for the "data" scheme in URLsThiago Macieira2010-05-151-1/+1
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7Eskil Abrahamsen Blomfeldt2010-05-106-92/+88
|\ \
| * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-05-022-3/+16
| |\ \
| | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-05-022-3/+16
| | |\ \
| * | \ \ Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2010-05-014-50/+45
| |\ \ \ \ | | |/ / / | |/| | / | | | |/ | | |/|
| | * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-05-011-17/+40
| | |\ \
| | | * | Fix bold text rendering of Thai and Vietnamese on SymbianAlessandro Portale2010-04-301-17/+40
| | * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-04-301-6/+3
| | |\ \ \ | | | |/ / | | |/| |
| | | * | Fixed a leak in QTextDocument::print().Trond Kjernåsen2010-04-291-6/+3
| | * | | Removing unused code.Alessandro Portale2010-04-302-27/+2
| | |/ /
| * | | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2010-04-295-49/+48
| |\ \ \ | | |/ /
| | * | Renaming a few unexported, private symbolsAlessandro Portale2010-04-284-46/+46
| | * | Fixed a QFontEngine leak for QFont objects used in threads.Trond Kjernåsen2010-04-271-3/+2
| * | | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2010-04-221-3/+5
| |\ \ \ | | |/ /
| | * | Removed inneccessary QGlyphLayout::offsets initialization.Alessandro Portale2010-04-211-2/+2
| | * | Fix mirrored characters for RTL text in SymbianAlessandro Portale2010-04-211-1/+3
* | | | Fix off-by-one in text layouts and widget size hints on MacEskil Abrahamsen Blomfeldt2010-05-101-1/+1
| |_|/ |/| |
* | | A small mistake when comparing the flag.Alexis Menard2010-04-281-1/+3
* | | Fix crash when CoreText fails to shape text for usTor Arne Vestbø2010-04-271-2/+13
|/ /
* | Odf export: Remove double namespace in tab-stops and fix table paddingEskil Abrahamsen Blomfeldt2010-04-191-6/+6
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-04-181-0/+2
|\ \
| * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-04-171-0/+2
| |\ \
| | * | Fix building of corelib, network and gui with qconfig minimal.Aaron McCarthy2010-04-161-0/+2
| * | | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Olivier Goffart2010-04-166-7/+7
| |\ \ \ | | |/ / | |/| / | | |/
| | * Symbol visibility fixes for RVCT4 on SymbianIain2010-04-156-7/+7
* | | Further RVCT4 fixes for SymbianIain2010-04-161-2/+2
* | | Symbol visibility fixes for RVCT4 on SymbianIain2010-04-166-7/+7
* | | Simplify docs a bitThomas Zander2010-04-161-1/+1
|/ /
* | Fix gcc compile warning in qstatictext.cppEskil Abrahamsen Blomfeldt2010-04-141-1/+1
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7Eskil Abrahamsen Blomfeldt2010-03-307-15/+71
|\ \
| * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-04-142-5/+12
| |\ \
| | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-04-132-5/+12
| | |\ \
| | | * | doc: Clarify effect of QFont::NoFontMergingEskil Abrahamsen Blomfeldt2010-04-131-3/+5
| | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-04-121-2/+7
| | | |\ \
| | | | * \ Merge commit 'internal-qt-repo/4.7' into oslo-staging-2/4.7Tom Cooksey2010-04-121-1/+3
| | | | |\ \
| | | | * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-04-101-2/+7
| | | | |\ \ \
| * | | | \ \ \ Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2010-04-141-1/+1
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| | * | | | | | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2010-04-131-1/+1
| | |\ \ \ \ \ \ | | | |/ / / / / | | |/| | | | / | | | | |_|_|/ | | | |/| | |
| | | * | | | CSS: fixes border only affecting the first widget.Olivier Goffart2010-04-121-1/+1
| * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-04-131-7/+25
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-04-121-7/+25
| | |\ \ \ \ \ | | | |_|_|_|/ | | |/| | | |
| | | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-04-101-7/+25
| | | |\ \ \ \ | | | | |_|/ / | | | |/| | |
| | | | * | | Fix QTextDocument::undo() cursor positioningmae2010-04-071-7/+25
| * | | | | | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2010-04-121-2/+4
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | / / | | | |_|/ / | | |/| | |
| | * | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-04-121-2/+4
| | |\ \ \ \