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 | David Boddie | 2010-03-30 | 298 | -5160/+10977 |
|\ | |||||
| * | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7 | Eskil Abrahamsen Blomfeldt | 2010-03-30 | 1 | -0/+1 |
| |\ | |||||
| | * | Hack .pro files on windows to define QT_NO_EGL | Tom Cooksey | 2010-03-30 | 1 | -0/+1 |
| * | | Support the pen set on the painter in QStaticText when using rich text | Eskil Abrahamsen Blomfeldt | 2010-03-30 | 1 | -0/+5 |
| * | | Fix setting font for QStaticText on Linux and Mac | Eskil Abrahamsen Blomfeldt | 2010-03-30 | 1 | -5/+5 |
| |/ | |||||
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ... | Qt Continuous Integration System | 2010-03-30 | 29 | -1111/+2093 |
| |\ | |||||
| | * | Work-around Symbian 10.1's broken egl.h | Tom Cooksey | 2010-03-29 | 2 | -4/+9 |
| | * | Add some #warnings to debug Symbian EGL build failure | Tom Cooksey | 2010-03-29 | 1 | -0/+24 |
| | * | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7 | Eskil Abrahamsen Blomfeldt | 2010-03-29 | 5 | -29/+66 |
| | |\ | |||||
| | | * | Don't try to resolve EGLImage function pointers if they are defined | Tom Cooksey | 2010-03-29 | 1 | -0/+2 |
| | | * | Change ORs to ANDs when checking EGLImage extension defines | Tom Cooksey | 2010-03-29 | 2 | -4/+4 |
| | | * | Protect EGLImage function definitions in #ifdef | Tom Cooksey | 2010-03-29 | 1 | -0/+2 |
| | | * | Round instead of ceil font metrics when ForceIntegerMetrics is enabled | Tor Arne Vestbø | 2010-03-26 | 1 | -24/+24 |
| | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ... | Qt Continuous Integration System | 2010-03-26 | 25 | -1003/+1905 |
| | | |\ | |||||
| | | | * | Implement Texture-From-Pixmap using EGLImage extensions on X11/EGL | Tom Cooksey | 2010-03-26 | 2 | -2/+31 |
| | * | | | Implement proper QStaticText support in QPaintBuffer | Eskil Abrahamsen Blomfeldt | 2010-03-29 | 2 | -14/+29 |
| | * | | | Make QStaticText layout lazy | Eskil Abrahamsen Blomfeldt | 2010-03-29 | 4 | -29/+45 |
| | * | | | Change QStaticText::setMaximumSize() to setTextWidth() | Eskil Abrahamsen Blomfeldt | 2010-03-29 | 5 | -70/+77 |
| | * | | | Respect QPainter::pen() in QPainter::drawStaticText() | Eskil Abrahamsen Blomfeldt | 2010-03-29 | 2 | -4/+13 |
| | | |/ | | |/| | |||||
| | * | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7 | Eskil Abrahamsen Blomfeldt | 2010-03-26 | 13 | -487/+1491 |
| | |\ \ | |||||
| | | * | | Paintbuffer single frame profiling. | Samuel Rødal | 2010-03-26 | 3 | -16/+310 |
| | | * | | Optimized ARGB32PM on RGB16 blending with opacity using NEON. | Samuel Rødal | 2010-03-26 | 1 | -5/+32 |
| | | * | | Optimized SourceOver and 16 bit dest fetches, dest stores using NEON. | Samuel Rødal | 2010-03-26 | 3 | -15/+134 |
| | | * | | Optimized scaled/transformed image blending for ARGB32PM and RGB16 on RGB16. | Samuel Rødal | 2010-03-26 | 7 | -419/+890 |
| | | * | | Included ARM NEON optimizations from pixman in Qt. | Samuel Rødal | 2010-03-26 | 6 | -49/+140 |
| | | * | | Safeguard the colortable access when converting corrupted indexed8 | Gunnar Sletta | 2010-03-26 | 1 | -2/+2 |
| | | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7 | Eskil Abrahamsen Blomfeldt | 2010-03-26 | 59 | -721/+892 |
| | | |\ \ | |||||
| | | * | | | Fix QItemDelegate::textRectangle | Eskil Abrahamsen Blomfeldt | 2010-03-26 | 1 | -1/+3 |
| | * | | | | 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 | 54 | -233/+572 |
| | |\ \ \ | |||||
| | * | | | | Fix warnings and build on mingw | Thierry Bastian | 2010-03-25 | 1 | -470/+141 |
| | * | | | | Fixed QPrintPreview text drawing (visible in Assistant). | Trond Kjernåsen | 2010-03-25 | 1 | -2/+7 |
| | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7 | Eskil Abrahamsen Blomfeldt | 2010-03-25 | 6 | -9/+148 |
| | |\ \ \ \ | |||||
| | | * | | | | itemChange() is now called when transformation properties change. | Yoann Lopes | 2010-03-25 | 2 | -6/+129 |
| | | | |/ / | | | |/| | | |||||
| | | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7 | Eskil Abrahamsen Blomfeldt | 2010-03-25 | 2 | -0/+13 |
| | | |\ \ \ | |||||
| | | | * \ \ | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ... | Qt Continuous Integration System | 2010-03-25 | 3 | -21/+53 |
| | | | |\ \ \ | |||||
| | | * | | | | | Fix QLabel::sizeHint() | Eskil Abrahamsen Blomfeldt | 2010-03-25 | 1 | -1/+4 |
| | | * | | | | | 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 | 6 | -16/+16 |
| | |\ \ \ \ | |||||
| | * | | | | | Add QFont::ForceIntegerMetrics style strategy flag | Eskil Abrahamsen Blomfeldt | 2010-03-24 | 3 | -21/+53 |
| * | | | | | | Make QDeclarativeListProperty a class | Aaron Kennedy | 2010-03-30 | 1 | -1/+2 |
| * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration | Qt Continuous Integration System | 2010-03-26 | 28 | -134/+498 |
| |\ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | | |||||
| | * | | | | | Test and fix order of transform application. | Warwick Allison | 2010-03-26 | 2 | -0/+17 |
| | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7 | Martin Jones | 2010-03-25 | 54 | -233/+572 |
| | |\ \ \ \ \ | | | | |_|_|/ | | | |/| | | | |||||
| | * | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.7 | Alexis Menard | 2010-03-25 | 28 | -134/+481 |
| | |\ \ \ \ \ | | | |_|_|_|/ | | |/| | | | | |||||
| * | | | | | | Fix the bug where the ampersand symbol would be discarded. | Fabien Freling | 2010-03-26 | 2 | -3/+7 |
| | |_|/ / / | |/| | | | | |||||
| * | | | | | Add experimental support for StaticContents in Mac OS X. | Fabien Freling | 2010-03-25 | 1 | -1/+18 |
| * | | | | | Fix misspelling in function name. | Fabien Freling | 2010-03-25 | 1 | -2/+2 |
| * | | | | | Merge remote branch 'main/4.7' into 4.7 | Morten Johan Sørvig | 2010-03-25 | 2 | -0/+13 |
| |\ \ \ \ \ | | |/ / / / |