summaryrefslogtreecommitdiffstats
path: root/src/gui
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7David Boddie2010-03-30298-5160/+10977
|\
| * Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7Eskil Abrahamsen Blomfeldt2010-03-301-0/+1
| |\
| | * Hack .pro files on windows to define QT_NO_EGLTom Cooksey2010-03-301-0/+1
| * | Support the pen set on the painter in QStaticText when using rich textEskil Abrahamsen Blomfeldt2010-03-301-0/+5
| * | Fix setting font for QStaticText on Linux and MacEskil Abrahamsen Blomfeldt2010-03-301-5/+5
| |/
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-03-3029-1111/+2093
| |\
| | * Work-around Symbian 10.1's broken egl.hTom Cooksey2010-03-292-4/+9
| | * Add some #warnings to debug Symbian EGL build failureTom Cooksey2010-03-291-0/+24
| | * Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7Eskil Abrahamsen Blomfeldt2010-03-295-29/+66
| | |\
| | | * Don't try to resolve EGLImage function pointers if they are definedTom Cooksey2010-03-291-0/+2
| | | * Change ORs to ANDs when checking EGLImage extension definesTom Cooksey2010-03-292-4/+4
| | | * Protect EGLImage function definitions in #ifdefTom Cooksey2010-03-291-0/+2
| | | * Round instead of ceil font metrics when ForceIntegerMetrics is enabledTor Arne Vestbø2010-03-261-24/+24
| | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-03-2625-1003/+1905
| | | |\
| | | | * Implement Texture-From-Pixmap using EGLImage extensions on X11/EGLTom Cooksey2010-03-262-2/+31
| | * | | Implement proper QStaticText support in QPaintBufferEskil Abrahamsen Blomfeldt2010-03-292-14/+29
| | * | | Make QStaticText layout lazyEskil Abrahamsen Blomfeldt2010-03-294-29/+45
| | * | | Change QStaticText::setMaximumSize() to setTextWidth()Eskil Abrahamsen Blomfeldt2010-03-295-70/+77
| | * | | Respect QPainter::pen() in QPainter::drawStaticText()Eskil Abrahamsen Blomfeldt2010-03-292-4/+13
| | | |/ | | |/|
| | * | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7Eskil Abrahamsen Blomfeldt2010-03-2613-487/+1491
| | |\ \
| | | * | Paintbuffer single frame profiling.Samuel Rødal2010-03-263-16/+310
| | | * | Optimized ARGB32PM on RGB16 blending with opacity using NEON.Samuel Rødal2010-03-261-5/+32
| | | * | Optimized SourceOver and 16 bit dest fetches, dest stores using NEON.Samuel Rødal2010-03-263-15/+134
| | | * | Optimized scaled/transformed image blending for ARGB32PM and RGB16 on RGB16.Samuel Rødal2010-03-267-419/+890
| | | * | Included ARM NEON optimizations from pixman in Qt.Samuel Rødal2010-03-266-49/+140
| | | * | Safeguard the colortable access when converting corrupted indexed8Gunnar Sletta2010-03-261-2/+2
| | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7Eskil Abrahamsen Blomfeldt2010-03-2659-721/+892
| | | |\ \
| | | * | | Fix QItemDelegate::textRectangleEskil Abrahamsen Blomfeldt2010-03-261-1/+3
| | * | | | Synchronize rich text and plain text code paths in QStaticTextEskil Abrahamsen Blomfeldt2010-03-261-2/+4
| | | |/ / | | |/| |
| | * | | Merge remote branch 'origin/4.7' into 4.7Olivier Goffart2010-03-2554-233/+572
| | |\ \ \
| | * | | | Fix warnings and build on mingwThierry Bastian2010-03-251-470/+141
| | * | | | Fixed QPrintPreview text drawing (visible in Assistant).Trond Kjernåsen2010-03-251-2/+7
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7Eskil Abrahamsen Blomfeldt2010-03-256-9/+148
| | |\ \ \ \
| | | * | | | itemChange() is now called when transformation properties change.Yoann Lopes2010-03-252-6/+129
| | | | |/ / | | | |/| |
| | | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7Eskil Abrahamsen Blomfeldt2010-03-252-0/+13
| | | |\ \ \
| | | | * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-03-253-21/+53
| | | | |\ \ \
| | | * | | | | Fix QLabel::sizeHint()Eskil Abrahamsen Blomfeldt2010-03-251-1/+4
| | | * | | | | Fix QFontMetrics::height() and QFontMetrics autotestEskil Abrahamsen Blomfeldt2010-03-251-2/+2
| | | | |/ / / | | | |/| | |
| | * | | | | Fix glyph advance on Mac/CarbonEskil Abrahamsen Blomfeldt2010-03-251-10/+43
| | |/ / / /
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7Eskil Abrahamsen Blomfeldt2010-03-246-16/+16
| | |\ \ \ \
| | * | | | | Add QFont::ForceIntegerMetrics style strategy flagEskil Abrahamsen Blomfeldt2010-03-243-21/+53
| * | | | | | Make QDeclarativeListProperty a classAaron Kennedy2010-03-301-1/+2
| * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-03-2628-134/+498
| |\ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| | * | | | | Test and fix order of transform application.Warwick Allison2010-03-262-0/+17
| | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7Martin Jones2010-03-2554-233/+572
| | |\ \ \ \ \ | | | | |_|_|/ | | | |/| | |
| | * | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.7Alexis Menard2010-03-2528-134/+481
| | |\ \ \ \ \ | | | |_|_|_|/ | | |/| | | |
| * | | | | | Fix the bug where the ampersand symbol would be discarded.Fabien Freling2010-03-262-3/+7
| | |_|/ / / | |/| | | |
| * | | | | Add experimental support for StaticContents in Mac OS X.Fabien Freling2010-03-251-1/+18
| * | | | | Fix misspelling in function name.Fabien Freling2010-03-251-2/+2
| * | | | | Merge remote branch 'main/4.7' into 4.7Morten Johan Sørvig2010-03-252-0/+13
| |\ \ \ \ \ | | |/ / / /