summaryrefslogtreecommitdiffstats
path: root/src/gui/text
Commit message (Expand)AuthorAgeFilesLines
* Merge remote branch 'lighthouse/4.7' into lighthouse-masterPaul Olav Tvete2010-09-1314-39/+1756
|\
| * Merge branch 'qt-4.7' into lighthouse-4.7Paul Olav Tvete2010-09-1314-103/+165
| |\
| * | Initial pluggable fontdatabaseJørgen Lind2010-09-0214-41/+1758
| * | Merge branch 'qt-4.7' into lighthouse-4.7Paul Olav Tvete2010-08-263-22/+29
| |\ \
* | \ \ Merge remote branch 'qt/master' into lighthouse-masterPaul Olav Tvete2010-09-1327-187/+299
|\ \ \ \
| * \ \ \ Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-09-1011-86/+139
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | Pulled code form initializeDb() out into addFontToScreenDevice()Alessandro Portale2010-09-081-52/+53
| | * | | Moved font list getter to qfontdatabase_s60.cpp. Reusable.Alessandro Portale2010-09-082-9/+19
| | * | | Pulled some code from One long function into a short oneAlessandro Portale2010-09-081-5/+11
| | * | | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2010-09-072-7/+7
| | |\ \ \
| | | * | | Ensure that we load system libraries from the correct location.Jan-Arve Sæther2010-09-032-7/+7
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-09-031-0/+4
| | |\ \ \ \
| | | * | | | Recognize @, #, $ and ` as word separatorsThorbjørn Lindeijer2010-09-031-0/+4
| | * | | | | Fix QStaticText copy constructor to also copy text option propertyEskil Abrahamsen Blomfeldt2010-09-031-3/+3
| | |/ / / /
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-09-021-8/+28
| | |\ \ \ \
| | | * | | | Symbian: return better default font for SansSerif style hintAlessandro Portale2010-09-021-0/+27
| | | * | | | Removing a left over #if 1..#endif constructAlessandro Portale2010-09-021-8/+1
| | * | | | | Fix broken S60 buildJiang Jiang2010-09-022-1/+7
| | * | | | | Keep mirrored char handling consistent between some font enginesJiang Jiang2010-09-023-5/+1
| | * | | | | Fix symbol font detection in generic CMap decodingJiang Jiang2010-09-021-2/+2
| | |/ / / /
| | * | | | Fix compiling issue for FreeType version earlier than 2.1.10Jiang Jiang2010-09-011-2/+9
| | * | | | QTextEngine::LayoutData::reallocate musn't corrupt memoryJoão Abecasis2010-08-311-2/+5
| * | | | | C++0x move operatorsOlivier Goffart2010-09-032-2/+12
| * | | | | Fix compiler warning in qtextformat.hEskil Abrahamsen Blomfeldt2010-09-011-4/+4
| * | | | | Clean up and clarify Mac font engine codeJiang Jiang2010-08-312-74/+2
| * | | | | Implemented suffix and prefix strings for the numbering in ordered lists as s...Nils Jeisecke2010-08-3110-8/+120
| * | | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-08-307-17/+26
| |\ \ \ \ \ | | |/ / / /
| | * | | | Correct last right bearing in boundingBox(glyphs)Jiang Jiang2010-08-277-17/+26
| | | |_|/ | | |/| |
* | | | | Merge remote branch 'qt/master' into lighthouse-masterPaul Olav Tvete2010-08-262-11/+4
|\ \ \ \ \ | |/ / / /
| * | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-08-252-8/+4
| |\ \ \ \ | | |/ / /
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7Gunnar Sletta2010-08-244-16/+35
| | |\ \ \
| | | * | | Ignore LayoutDirectionChange event in QTextControlJiang Jiang2010-08-191-8/+0
| | * | | | Use binarysort to find items.Gunnar Sletta2010-08-242-14/+29
| * | | | | Prefer Q_CHECK_PTR to q_check_ptrJoão Abecasis2010-08-191-3/+4
* | | | | | Merge remote branch 'lighthouse/4.7' into lighthouse-masterPaul Olav Tvete2010-08-191-0/+4
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | Merge remote branch 'qt/4.7' into lighthouse-4.7Paul Olav Tvete2010-08-196-44/+151
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| | * | | | respect the layout direction in the default text optionLars Knoll2010-08-181-0/+4
* | | | | | Merge remote branch 'qt/master' into lighthouse-masterPaul Olav Tvete2010-08-1911-100/+244
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-08-136-46/+156
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | Disable minRightBearing optimization in QTextLayout on MacEskil Abrahamsen Blomfeldt2010-08-111-0/+2
| | * | | | doc: Clarify documentation of QStaticTextEskil Abrahamsen Blomfeldt2010-08-091-4/+12
| | * | | | Fix scrollbar randomly popping up in QPlainTextEditEskil Abrahamsen Blomfeldt2010-08-091-4/+17
| | | |/ / | | |/| |
| | * | | Fix QTextEngine overflow caused by extremely long textJiang Jiang2010-08-053-33/+87
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-08-021-3/+29
| | |\ \ \
| | | * | | Fix Japanese characters not displayed in webkit on Mac Cocoa 64 (Regression)Simon Hausmann2010-08-021-3/+29
| * | | | | Make selection work across ligaturesJiang Jiang2010-08-101-21/+43
| * | | | | Remove the use of deprecated qVariant*Olivier Goffart2010-08-063-22/+22
| * | | | | Implement QFontMetrics::inFont(uint) which takes UCS-4 encoded charEskil Abrahamsen Blomfeldt2010-08-062-1/+33
| * | | | | Remove obsolete code & workarounds for unsupported versions of MS Visual C++miniak2010-08-032-12/+0
* | | | | | Merge remote branch 'lighthouse/4.7' into lighthouse-masterJørgen Lind2010-08-052-2/+10
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |