summaryrefslogtreecommitdiffstats
path: root/src/gui/text
Commit message (Expand)AuthorAgeFilesLines
* Fixing merge conflicts.Martin Smith2010-07-136-27/+46
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-07-121-1/+2
| |\
| | * Enable cross-process glyph cache for OpenVG graphics system on Symbian.Jason Barron2010-07-121-1/+1
| | * Add new file for Symbian specific VG stuff and add Symbian glyph cache.Jason Barron2010-07-121-0/+1
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-07-105-26/+44
| |\ \ | | |/ | |/|
| | * Fix QTextDocument::markContentsDirty()mae2010-07-091-4/+4
| | * Fix crashmae2010-07-082-1/+5
| | * Fix exponential behavior of QTextCursor::removeSelectedTextmae2010-07-082-3/+16
| | * Revert "Fix exponential behavior of QTextCursor::removeSelectedText"Michael Brasser2010-07-072-8/+0
| | * Fix performance of QTextDocumentPrivate::adjustDocumentChangesAndCursorsChristian Kamm2010-07-064-21/+22
| | * Fix exponential behavior of QTextCursor::removeSelectedTextmae2010-07-022-0/+8
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-07-101-1/+6
|\ \ \ | |/ / |/| |
| * | doc: Fixed several qdoc warnings.Martin Smith2010-07-091-1/+6
| |/
* | Add three new style-hints to QFont to match CSS' generic font familiesTor Arne Vestbø2010-07-086-1/+34
|/
* Made -graphicssystem trace work with Qt::TextBypassShaping flag.Samuel Rødal2010-06-292-3/+3
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7-s60axis2010-06-241-1/+1
|\
| * Make QtFontFamily::symbol_checked a bitfield.Andreas Kling2010-06-241-1/+1
* | Don't crash when cleaning the uninitialized fontdatabase (Symbian)Alessandro Portale2010-06-241-0/+2
|/
* Improve text performance with QtWebKit in Qt 4.7Simon Hausmann2010-06-231-1/+23
* Fix a crash on exit. Destruction order in font database. (Symbian^4)Alessandro Portale2010-06-221-6/+15
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-06-214-26/+30
|\
| * Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Andy Shaw2010-06-2122-73/+202
| |\
| | * Fix compiler warnings in QtGui (text,painting).Friedemann Kleint2010-06-212-6/+5
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7David Boddie2010-06-184-12/+15
| | |\
| | * \ Merge commit 'refs/merge-requests/691' of git://gitorious.org/qt/qt into inte...David Boddie2010-06-181-20/+23
| | |\ \
| | | * | Documentation changes to QTextLayout.Robin Burchell2010-06-151-20/+23
| * | | | Make sure that <br/> is seen as a valid tag in Qt::mightBeRichText()Andy Shaw2010-06-211-0/+2
* | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into qt-4.7-from-4.6Simon Hausmann2010-06-201-3/+11
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Fix possible crash in QTextLayout for glyphless itemsEskil Abrahamsen Blomfeldt2010-06-171-3/+11
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-06-171-4/+9
|\ \ \ \ \
| * | | | | Allocate the memory for QtFontSize when count > 1Benjamin Poulain2010-06-161-1/+1
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-06-161-4/+9
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| | * | | | Reduce the memory consumption of QtFontStyleBenjamin Poulain2010-06-161-4/+9
* | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-06-171-1/+2
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Fix crash on Mac OS X when drawing text with Qt::TextBypassShaping setTor Arne Vestbø2010-06-161-1/+2
| |/ / / /
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into qt-4.7-from-4.6Simon Hausmann2010-06-163-3/+11
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-06-163-3/+11
| |\ \ \ \
| | * \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-06-153-3/+11
| | |\ \ \ \
| | | * \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-06-153-3/+11
| | | |\ \ \ \
| | | | * \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-06-123-3/+11
| | | | |\ \ \ \ | | | | | | |/ / | | | | | |/| / | | | | | |_|/ | | | | |/| |
| | | | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-06-083-3/+12
| | | | | |\ \
| | | | | | * | Fix a freetype link failure.Anders Bakken2010-06-081-1/+2
| | | | | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-06-082-2/+10
| | | | | | |\ \
| | | | | | | * | Fix incorrect \since tagSimon Hausmann2010-06-071-1/+1
| | | | | | | * | Add convenience constructor to QTextOption::TabDavid Faure2010-06-042-2/+10
* | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into qt-4.7-from-4.6Simon Hausmann2010-06-161-1/+1
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Fix regression, remove artificial emboldening of monospaced fontsEskil Abrahamsen Blomfeldt2010-06-151-1/+1
| |/ / / / / / /
* | | | | | | | Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2010-06-152-10/+12
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2010-06-142-10/+12
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| | * | | | | | Prospective S60 build fixSimon Hausmann2010-06-132-4/+4