Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt | Gunnar Sletta | 2010-09-27 | 14 | -65/+77 |
|\ | |||||
| * | Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration... | Qt Continuous Integration System | 2010-09-22 | 2 | -2/+0 |
| |\ | |||||
| | * | Merge remote branch 'origin/4.7' into qt-master-from-4.7 | Thiago Macieira | 2010-09-22 | 2 | -2/+0 |
| | |\ | |||||
| | | * | remove extra includes | Ritt Konstantin | 2010-09-21 | 2 | -2/+0 |
| * | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master... | Qt Continuous Integration System | 2010-09-22 | 1 | -2/+6 |
| |\ \ \ | | |/ / | |/| | | |||||
| | * | | Keep other text format with QTextOption::SuppressColors tag on | Jiang Jiang | 2010-09-22 | 1 | -2/+6 |
| | * | | Make QStaticText honor QPainter::pen() for rich text on X11 w/raster | Eskil Abrahamsen Blomfeldt | 2010-09-20 | 1 | -1/+4 |
| * | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7 | Thiago Macieira | 2010-09-21 | 5 | -9/+26 |
| |\ \ \ | | |/ / | |/| / | | |/ | |||||
| | * | Make QStaticText honor QPainter::pen() for rich text on X11 w/raster | Eskil Abrahamsen Blomfeldt | 2010-09-20 | 1 | -1/+4 |
| | * | Doc: Listed undoable operations in QTextDocument | Geir Vattekar | 2010-09-15 | 1 | -1/+12 |
| | * | Merge branch '4.7-upstream' into 4.7-doc | A-Team | 2010-09-13 | 1 | -2/+2 |
| | |\ | |||||
| | | * | Linux: Fix mispositioned, misclipped glyphs in large fonts (QStaticText) | Eskil Abrahamsen Blomfeldt | 2010-09-13 | 1 | -2/+2 |
| | * | | Merge branch '4.7-upstream' into 4.7-doc | A-Team | 2010-09-10 | 2 | -2/+4 |
| | |\ \ | | | |/ | |||||
| | | * | Fix cache_cost initialization of QFontEngineMultiWin | Jiang Jiang | 2010-09-10 | 1 | -0/+3 |
| | | * | Fix crash when using unprintable chars in QStaticText | Eskil Abrahamsen Blomfeldt | 2010-09-10 | 1 | -2/+1 |
| | * | | Merge branch '4.7-upstream' into 4.7-doc | A-Team | 2010-09-09 | 4 | -73/+90 |
| | |\ \ | | | |/ | |||||
| | * | | Merge branch '4.7-oslo1' into 4.7-doc | A-Team | 2010-09-07 | 2 | -3/+7 |
| | |\ \ | |||||
| | * \ \ | Merge commit 'staging-1/4.7' into doc-4.7 | Morten Engvoldsen | 2010-09-03 | 7 | -19/+51 |
| | |\ \ \ | |||||
| | * \ \ \ | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into doc-4.7 | Morten Engvoldsen | 2010-09-02 | 2 | -3/+4 |
| | |\ \ \ \ | |||||
| | | * | | | | Clarified iterator semantic in documentation and added a code snippet to a QM... | Jerome Pasion | 2010-08-31 | 1 | -2/+3 |
| | | * | | | | Fixed spelling, broken links, and missing default values. | Jerome Pasion | 2010-08-30 | 1 | -1/+1 |
| * | | | | | | Fix crash in Mac font loading | Jiang Jiang | 2010-09-14 | 2 | -8/+3 |
| * | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master... | Qt Continuous Integration System | 2010-09-10 | 8 | -47/+45 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | Fix Core Text font loading for certain Mac Fonts | Jiang Jiang | 2010-09-10 | 3 | -29/+24 |
| | * | | | | | | Support sub pixel positioning of glyphs in raster engine | Eskil Abrahamsen Blomfeldt | 2010-09-09 | 7 | -18/+21 |
* | | | | | | | | 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 |