Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| | | * | | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7 | Eskil Abrahamsen Blomfeldt | 2010-03-29 | 1 | -24/+24 | |
| | | |\ \ \ \ | ||||||
| | | * | | | | | Make QStaticText layout lazy | Eskil Abrahamsen Blomfeldt | 2010-03-29 | 3 | -28/+44 | |
| | | * | | | | | Change QStaticText::setMaximumSize() to setTextWidth() | Eskil Abrahamsen Blomfeldt | 2010-03-29 | 3 | -44/+55 | |
| | | * | | | | | Respect QPainter::pen() in QPainter::drawStaticText() | Eskil Abrahamsen Blomfeldt | 2010-03-29 | 1 | -3/+12 | |
| | * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7 | Martin Jones | 2010-03-25 | 3 | -10/+9 | |
| | |\ \ \ \ \ \ | | | | |_|_|/ / | | | |/| | | | | ||||||
| | * | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.7 | Alexis Menard | 2010-03-25 | 6 | -11/+60 | |
| | |\ \ \ \ \ \ | ||||||
| * | \ \ \ \ \ \ | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6 | Eskil Abrahamsen Blomfeldt | 2010-03-30 | 2 | -0/+10 | |
| |\ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / | | |/| | | | | | | ||||||
| | * | | | | | | | Adding QFontDatabase::removeAllApplicationFonts() | Alessandro Portale | 2010-03-29 | 1 | -0/+5 | |
| | * | | | | | | | Compile with MSVC 2005 and 2003 when no platform SDK is used | Andy Shaw | 2010-03-29 | 1 | -0/+5 | |
| | | |/ / / / / | | |/| | | | | | ||||||
| * | | | | | | | Compile on MingW | Eskil Abrahamsen Blomfeldt | 2010-03-30 | 2 | -0/+4 | |
| |/ / / / / / | ||||||
| * | | | | | | Recommit 1ebeb971d3382aec0fff927 | Eskil Abrahamsen Blomfeldt | 2010-03-22 | 6 | -11/+60 | |
* | | | | | | | Fix use of bitmap fonts on some Linux systems | Eskil Abrahamsen Blomfeldt | 2010-03-30 | 1 | -2/+7 | |
| |_|_|_|/ / |/| | | | | | ||||||
* | | | | | | Round instead of ceil font metrics when ForceIntegerMetrics is enabled | Tor Arne Vestbø | 2010-03-26 | 1 | -24/+24 | |
| |_|_|/ / |/| | | | | ||||||
* | | | | | Synchronize rich text and plain text code paths in QStaticText | Eskil Abrahamsen Blomfeldt | 2010-03-26 | 1 | -2/+4 | |
* | | | | | Merge remote branch 'origin/4.7' into 4.7 | Olivier Goffart | 2010-03-25 | 3 | -10/+9 | |
|\ \ \ \ \ | | |_|/ / | |/| | | | ||||||
| * | | | | Merge remote branch 'origin/4.7' into HEAD | Thiago Macieira | 2010-03-24 | 1 | -3/+2 | |
| |\ \ \ \ | | | |/ / | | |/| | | ||||||
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ... | Qt Continuous Integration System | 2010-03-23 | 3 | -10/+9 | |
| |\ \ \ \ | | |_|_|/ | |/| | | | ||||||
| | * | | | Make QStackTextEngine cheaper to construct | Andreas Kling | 2010-03-22 | 1 | -5/+4 | |
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ... | Qt Continuous Integration System | 2010-03-22 | 2 | -5/+5 | |
| | |\ \ \ | ||||||
| | | * | | | Compile Qt in C++0x mode. | Thiago Macieira | 2010-03-20 | 1 | -1/+1 | |
| | | * | | | Merge remote branch 'origin/4.7' into oslo-staging-1 | Aaron McCarthy | 2010-03-19 | 3 | -5/+5 | |
| | | |\ \ \ | ||||||
| | | * | | | | Rename QTimestamp to QElapsedTimer | Thiago Macieira | 2010-03-17 | 1 | -3/+3 | |
| | | * | | | | Port QtGui uses of QTime as a stopwatch to QTimestamp | Thiago Macieira | 2010-03-17 | 1 | -4/+4 | |
* | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7 | Eskil Abrahamsen Blomfeldt | 2010-03-25 | 1 | -2/+2 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Fix QFontMetrics::height() and QFontMetrics autotest | Eskil Abrahamsen Blomfeldt | 2010-03-25 | 1 | -2/+2 | |
* | | | | | | | | Fix glyph advance on Mac/Carbon | Eskil Abrahamsen Blomfeldt | 2010-03-25 | 1 | -10/+43 | |
|/ / / / / / / | ||||||
* | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7 | Eskil Abrahamsen Blomfeldt | 2010-03-24 | 1 | -3/+2 | |
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | | | ||||||
| * | | | | | | compile fix for mingw (also removes some warnings) | Thierry Bastian | 2010-03-23 | 1 | -3/+2 | |
| |/ / / / / | ||||||
* | | | | | | Add QFont::ForceIntegerMetrics style strategy flag | Eskil Abrahamsen Blomfeldt | 2010-03-24 | 3 | -21/+53 | |
|/ / / / / | ||||||
* | | | | | Add new function QTextLine::horizontalAdvance() | Eskil Abrahamsen Blomfeldt | 2010-03-23 | 2 | -0/+15 | |
|/ / / / | ||||||
* | | | | Merge branch '4.6-s60' into 4.7-s60 | axis | 2010-03-22 | 1 | -41/+82 | |
|\ \ \ \ | |_|/ / |/| | / | | |/ | |/| | ||||||
| * | | Revert "Optimize getting bearings of a glyph on Windows for true type fonts" | Olivier Goffart | 2010-03-19 | 6 | -59/+11 | |
| * | | Optimize getting bearings of a glyph on Windows for true type fonts | Eskil Abrahamsen Blomfeldt | 2010-03-17 | 6 | -11/+59 | |
| * | | Optimize speed of QTextLayout and QPainter::drawText | Eskil Abrahamsen Blomfeldt | 2010-03-17 | 1 | -40/+82 | |
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr... | Qt Continuous Integration System | 2010-03-17 | 3 | -5/+5 | |
|\ \ \ | |_|/ |/| | | ||||||
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr... | Qt Continuous Integration System | 2010-03-17 | 3 | -5/+5 | |
| |\ \ | ||||||
| | * \ | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7-s60 | axis | 2010-03-16 | 1 | -1/+2 | |
| | |\ \ | ||||||
| | * \ \ | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public | axis | 2010-03-15 | 4 | -7/+18 | |
| | |\ \ \ | ||||||
| | * \ \ \ | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public | axis | 2010-03-11 | 7 | -58/+138 | |
| | |\ \ \ \ | ||||||
| | * \ \ \ \ | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public | axis | 2010-03-01 | 4 | -9/+12 | |
| | |\ \ \ \ \ | ||||||
| | * \ \ \ \ \ | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public | axis | 2010-02-23 | 8 | -7/+913 | |
| | |\ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public into merge-w... | axis | 2010-02-19 | 1 | -6/+13 | |
| | |\ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public | axis | 2010-02-16 | 7 | -31/+81 | |
| | |\ \ \ \ \ \ \ \ | ||||||
| | | * \ \ \ \ \ \ \ | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into master-s60 | axis | 2010-02-16 | 3 | -4/+9 | |
| | | |\ \ \ \ \ \ \ \ | ||||||
| | * | \ \ \ \ \ \ \ \ | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt | axis | 2010-02-12 | 10 | -39/+87 | |
| | |\ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / | | | |/| | | | | | | | | ||||||
| | * | | | | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public | axis | 2010-01-21 | 93 | -158/+154 | |
| | |\ \ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ \ \ | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-s60-public | axis | 2009-12-18 | 26 | -239/+324 | |
| | |\ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ \ \ \ | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt | axis | 2009-11-06 | 24 | -181/+321 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | Various header file inclusion fixes for rvct on linux using a case-sensitive ... | Simon Hausmann | 2009-10-23 | 4 | -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-03-17 | 5 | -6/+59 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | |