Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote branch 'lighthouse/4.7' into lighthouse-master | Paul Olav Tvete | 2010-09-13 | 14 | -39/+1756 |
|\ | |||||
| * | Merge branch 'qt-4.7' into lighthouse-4.7 | Paul Olav Tvete | 2010-09-13 | 14 | -103/+165 |
| |\ | |||||
| * | | Initial pluggable fontdatabase | Jørgen Lind | 2010-09-02 | 14 | -41/+1758 |
| * | | Merge branch 'qt-4.7' into lighthouse-4.7 | Paul Olav Tvete | 2010-08-26 | 3 | -22/+29 |
| |\ \ | |||||
* | \ \ | Merge remote branch 'qt/master' into lighthouse-master | Paul Olav Tvete | 2010-09-13 | 27 | -187/+299 |
|\ \ \ \ | |||||
| * \ \ \ | Merge remote branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2010-09-10 | 11 | -86/+139 |
| |\ \ \ \ | | | |_|/ | | |/| | | |||||
| | * | | | Pulled code form initializeDb() out into addFontToScreenDevice() | Alessandro Portale | 2010-09-08 | 1 | -52/+53 |
| | * | | | Moved font list getter to qfontdatabase_s60.cpp. Reusable. | Alessandro Portale | 2010-09-08 | 2 | -9/+19 |
| | * | | | Pulled some code from One long function into a short one | Alessandro Portale | 2010-09-08 | 1 | -5/+11 |
| | * | | | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6 | Thiago Macieira | 2010-09-07 | 2 | -7/+7 |
| | |\ \ \ | |||||
| | | * | | | Ensure that we load system libraries from the correct location. | Jan-Arve Sæther | 2010-09-03 | 2 | -7/+7 |
| | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ... | Qt Continuous Integration System | 2010-09-03 | 1 | -0/+4 |
| | |\ \ \ \ | |||||
| | | * | | | | Recognize @, #, $ and ` as word separators | Thorbjørn Lindeijer | 2010-09-03 | 1 | -0/+4 |
| | * | | | | | Fix QStaticText copy constructor to also copy text option property | Eskil Abrahamsen Blomfeldt | 2010-09-03 | 1 | -3/+3 |
| | |/ / / / | |||||
| | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr... | Qt Continuous Integration System | 2010-09-02 | 1 | -8/+28 |
| | |\ \ \ \ | |||||
| | | * | | | | Symbian: return better default font for SansSerif style hint | Alessandro Portale | 2010-09-02 | 1 | -0/+27 |
| | | * | | | | Removing a left over #if 1..#endif construct | Alessandro Portale | 2010-09-02 | 1 | -8/+1 |
| | * | | | | | Fix broken S60 build | Jiang Jiang | 2010-09-02 | 2 | -1/+7 |
| | * | | | | | Keep mirrored char handling consistent between some font engines | Jiang Jiang | 2010-09-02 | 3 | -5/+1 |
| | * | | | | | Fix symbol font detection in generic CMap decoding | Jiang Jiang | 2010-09-02 | 1 | -2/+2 |
| | |/ / / / | |||||
| | * | | | | Fix compiling issue for FreeType version earlier than 2.1.10 | Jiang Jiang | 2010-09-01 | 1 | -2/+9 |
| | * | | | | QTextEngine::LayoutData::reallocate musn't corrupt memory | João Abecasis | 2010-08-31 | 1 | -2/+5 |
| * | | | | | C++0x move operators | Olivier Goffart | 2010-09-03 | 2 | -2/+12 |
| * | | | | | Fix compiler warning in qtextformat.h | Eskil Abrahamsen Blomfeldt | 2010-09-01 | 1 | -4/+4 |
| * | | | | | Clean up and clarify Mac font engine code | Jiang Jiang | 2010-08-31 | 2 | -74/+2 |
| * | | | | | Implemented suffix and prefix strings for the numbering in ordered lists as s... | Nils Jeisecke | 2010-08-31 | 10 | -8/+120 |
| * | | | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2010-08-30 | 7 | -17/+26 |
| |\ \ \ \ \ | | |/ / / / | |||||
| | * | | | | Correct last right bearing in boundingBox(glyphs) | Jiang Jiang | 2010-08-27 | 7 | -17/+26 |
| | | |_|/ | | |/| | | |||||
* | | | | | Merge remote branch 'qt/master' into lighthouse-master | Paul Olav Tvete | 2010-08-26 | 2 | -11/+4 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2010-08-25 | 2 | -8/+4 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7 | Gunnar Sletta | 2010-08-24 | 4 | -16/+35 |
| | |\ \ \ | |||||
| | | * | | | Ignore LayoutDirectionChange event in QTextControl | Jiang Jiang | 2010-08-19 | 1 | -8/+0 |
| | * | | | | Use binarysort to find items. | Gunnar Sletta | 2010-08-24 | 2 | -14/+29 |
| * | | | | | Prefer Q_CHECK_PTR to q_check_ptr | João Abecasis | 2010-08-19 | 1 | -3/+4 |
* | | | | | | Merge remote branch 'lighthouse/4.7' into lighthouse-master | Paul Olav Tvete | 2010-08-19 | 1 | -0/+4 |
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | | |||||
| * | | | | | Merge remote branch 'qt/4.7' into lighthouse-4.7 | Paul Olav Tvete | 2010-08-19 | 6 | -44/+151 |
| |\ \ \ \ \ | | | |_|/ / | | |/| | | | |||||
| | * | | | | respect the layout direction in the default text option | Lars Knoll | 2010-08-18 | 1 | -0/+4 |
* | | | | | | Merge remote branch 'qt/master' into lighthouse-master | Paul Olav Tvete | 2010-08-19 | 11 | -100/+244 |
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | |||||
| * | | | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2010-08-13 | 6 | -46/+156 |
| |\ \ \ \ \ | | | |/ / / | | |/| | | | |||||
| | * | | | | Disable minRightBearing optimization in QTextLayout on Mac | Eskil Abrahamsen Blomfeldt | 2010-08-11 | 1 | -0/+2 |
| | * | | | | doc: Clarify documentation of QStaticText | Eskil Abrahamsen Blomfeldt | 2010-08-09 | 1 | -4/+12 |
| | * | | | | Fix scrollbar randomly popping up in QPlainTextEdit | Eskil Abrahamsen Blomfeldt | 2010-08-09 | 1 | -4/+17 |
| | | |/ / | | |/| | | |||||
| | * | | | Fix QTextEngine overflow caused by extremely long text | Jiang Jiang | 2010-08-05 | 3 | -33/+87 |
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ... | Qt Continuous Integration System | 2010-08-02 | 1 | -3/+29 |
| | |\ \ \ | |||||
| | | * | | | Fix Japanese characters not displayed in webkit on Mac Cocoa 64 (Regression) | Simon Hausmann | 2010-08-02 | 1 | -3/+29 |
| * | | | | | Make selection work across ligatures | Jiang Jiang | 2010-08-10 | 1 | -21/+43 |
| * | | | | | Remove the use of deprecated qVariant* | Olivier Goffart | 2010-08-06 | 3 | -22/+22 |
| * | | | | | Implement QFontMetrics::inFont(uint) which takes UCS-4 encoded char | Eskil Abrahamsen Blomfeldt | 2010-08-06 | 2 | -1/+33 |
| * | | | | | Remove obsolete code & workarounds for unsupported versions of MS Visual C++ | miniak | 2010-08-03 | 2 | -12/+0 |
* | | | | | | Merge remote branch 'lighthouse/4.7' into lighthouse-master | Jørgen Lind | 2010-08-05 | 2 | -2/+10 |
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | |