summaryrefslogtreecommitdiffstats
path: root/src/gui/text
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2011-09-071-0/+8
|\
| * Fix the build with -qtnamespace configure optionssuzuki toshiya2011-09-061-0/+8
* | Merge remote-tracking branch 'upstream/4.8' into qt-4.8-from-4.7Sergio Ahumada2011-08-3113-43/+94
|\ \ | |/
| * Merge remote-tracking branch 'upstream/4.8'Sergio Ahumada2011-08-297-44/+56
| |\
| | * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into maste...Qt Continuous Integration System2011-08-285-13/+23
| | |\
| | | * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-teamaavit2011-08-245-13/+23
| | | |\
| | | | * Revert "Include trailing space width in RTL text line width"Eskil Abrahamsen Blomfeldt2011-08-241-5/+1
| | | | * Fix justification of RTL textEskil Abrahamsen Blomfeldt2011-08-241-1/+2
| | | | * Use CoreText for font rendering on uikit.Eike Ziller2011-08-243-7/+20
| | * | | Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2011-08-272-31/+33
| | |\ \ \ | | | |/ / | | |/| |
| * | | | Merge remote-tracking branch 'mainline/4.8'Oswald Buddenhagen2011-08-267-12/+42
| |\ \ \ \ | | |/ / /
| | * | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging into master...Qt Continuous Integration System2011-08-196-10/+42
| | |\ \ \ | | | |_|/ | | |/| |
| | | * | Doc: Fixed qdoc warnings.David Boddie2011-08-156-10/+42
| | * | | Merge remote-tracking branch 'qt-mainline/4.8'aavit2011-08-161-0/+1
| | |\ \ \
| | * \ \ \ Merge remote-tracking branch 'qt-mainline/4.8'aavit2011-08-162-3/+7
| | |\ \ \ \
| | * | | | | Fix bidi reordering of RTL text with embedded imagesEskil Abrahamsen Blomfeldt2011-08-161-2/+0
| * | | | | | Merge remote-tracking branch 'mainline/4.8'Oswald Buddenhagen2011-08-184-20/+33
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into maste...Qt Continuous Integration System2011-08-161-17/+25
| | |\ \ \ \ \ \ | | | |/ / / / / | | | | | / / / | | | |_|/ / / | | |/| | | |
| | | * | | | Minor optimizations for QTextEngineRitt Konstantin2011-08-081-17/+25
| | | | |/ / | | | |/| |
| * | | | | Add support for rawFonts loaded from data in FaceIdPierre Rossi2011-08-152-1/+4
| | |/ / / | |/| | |
* | | | | Merge branch 4.7 into qt-4.8-from-4.7Sergio Ahumada2011-08-311-11/+19
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Make text rendering working outside the gui thread on Symbian.Laszlo Agocs2011-08-301-11/+19
* | | | | Merge branch 4.7 into qt-4.8-from-4.7Sergio Ahumada2011-08-262-31/+33
|\ \ \ \ \ | |/ / / / | | | / / | |_|/ / |/| | |
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-08-241-19/+11
| |\ \ \
| * \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-08-241-12/+22
| |\ \ \ \
| | * | | | Make it easier to select words at the start of a line.Andrew den Exter2011-08-241-12/+22
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-08-221-11/+19
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| | * | | | Make text rendering working outside the gui thread on Symbian.Laszlo Agocs2011-08-161-11/+19
* | | | | | Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7Liang Qi2011-08-161-0/+1
|\ \ \ \ \ \ | |/ / / / / | | | | | / | |_|_|_|/ |/| | | |
| * | | | Join user state of removed text blocksLeandro Melo2011-08-151-0/+1
* | | | | Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7Liang Qi2011-08-152-3/+7
|\ \ \ \ \ | |/ / / / | | | | / | |_|_|/ |/| | |
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-08-051-1/+1
| |\ \ \ | | |/ /
| | * | Fix compile errors on S60 3.2Shane Kearns2011-08-051-1/+1
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-08-041-2/+6
| |\ \ \ | | | |/ | | |/|
| | * | Move cursorDelegate with the mouse selection of read only text input.Andrew den Exter2011-08-041-2/+6
* | | | Merge remote-tracking branch 'origin/4.8' into qt-4.8-from-4.7Liang Qi2011-08-0310-18/+45
|\ \ \ \
| * \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into maste...Qt Continuous Integration System2011-08-0110-18/+45
| |\ \ \ \
| | * | | | Include trailing space width in RTL text line widthJiang Jiang2011-07-261-1/+5
| | * | | | optimize QRawFont::supportsCharacter()Ritt Konstantin2011-07-222-4/+15
| | * | | | Merge remote branch 'mainline/4.8'Jiang Jiang2011-07-226-5/+21
| | |\ \ \ \
| | * | | | | Switch to use floating point pixelSize in QRawFont completelyJiang Jiang2011-07-217-13/+13
| | * | | | | Add a way to check if we have a matching family in the database.Pierre Rossi2011-07-212-0/+12
* | | | | | | Merge branch 4.7 into qt-4.8-from-4.7Qt Continuous Integration System2011-08-021-21/+2
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | / / / | | |_|/ / / | |/| | | |
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-08-021-21/+2
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| | * | | | Detect linked fonts by name (insead of via CLinkedTypeface* Api)Alessandro Portale2011-08-021-21/+2
* | | | | | Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7Liang Qi2011-07-294-27/+84
|\ \ \ \ \ \ | |/ / / / / | | | | / / | |_|_|/ / |/| | | |
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2011-07-281-12/+6
| |\ \ \ \
| | * | | | Revert binary search in QTextEngine::findItemJiang Jiang2011-07-281-12/+6
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2011-07-271-4/+15
| |\ \ \ \ \ | | |/ / / /
| | * | | | Save previous font engine for right bearing adjustmentJiang Jiang2011-07-271-5/+15