summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6-os1Prasanth Ullattil2010-01-285-8/+31
|\
| * Avoid call markParentDirty twice in prepareGeometryChangeLeonardo Sobral Cunha2010-01-273-4/+9
| * Added a warning to QGLWidget::renderText().Trond Kjernåsen2010-01-271-2/+20
| * Compiler warning.Bjørn Erik Nilsen2010-01-271-2/+2
| * Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-i...Pulse Build System2010-01-2728-523/+768
| |\
| | * Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-i...Pulse Build System2010-01-2628-523/+768
| | |\
| | | * Fixes visibility update missing when doing setParentItem on graphicsitemLeonardo Sobral Cunha2010-01-263-36/+41
| | | * Fixed an infinite loop that could occur when reading invalid BMP images.Trond Kjernåsen2010-01-261-1/+1
| | | * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-01-2527-488/+728
| | | |\
| | | | * Updated docs regarding QGLWidget::renderText() limitations.Trond Kjernåsen2010-01-251-0/+7
| | | | * Added optimization flag to QGraphicsItemPrivate.Samuel Rødal2010-01-252-0/+25
| | | | * Fixed child items with graphics effects not inheriting opacity.Samuel Rødal2010-01-252-4/+25
| | | | * Small optimization in raster paint engine.Samuel Rødal2010-01-251-2/+2
| | | | * Another ASSERT while deleting spansGabriel de Dietrich2010-01-251-1/+3
| | | | * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-01-2524-481/+666
| | | | |\
| | | | | * Implement QDirectFBPixmapData::scrollAnders Bakken2010-01-222-3/+29
| | | | | * Potential crash when adding items from QGraphicsWidget::polishEvent().Bjørn Erik Nilsen2010-01-222-16/+27
| | | | | * QGraphicsWidget is painted twice on the inital show.Bjørn Erik Nilsen2010-01-223-8/+18
| | | | | * Fix QPainter::redirection() to pass autotest.Gunnar Sletta2010-01-221-3/+2
| | | | | * Re-added the Close button in QPrintPreviewDialog for Mac/Carbon.Trond Kjernåsen2010-01-221-0/+10
| | | | | * Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6Gunnar Sletta2010-01-222-2/+3
| | | | | |\
| | | | | | * Fix rendering with simple shader in GL2 engineTom Cooksey2010-01-221-0/+3
| | | | | | * removed a debug traceThierry Bastian2010-01-221-2/+0
| | | | | * | Fix y-inverted pixmaps properly.Gunnar Sletta2010-01-221-9/+5
| | | | | |/
| | | | | * Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6Gunnar Sletta2010-01-2258-575/+872
| | | | | |\
| | | | | | * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-01-2216-439/+541
| | | | | | |\
| | | | | | | * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-01-2116-439/+541
| | | | | | | |\
| | | | | | | | * Only send QGraphicsItem::ParentChange(d) notifications from setParentItem.Bjørn Erik Nilsen2010-01-213-20/+28
| | | | | | | | * Pass value as const void *const to QGraphicsSceneIndex::itemChange.Bjørn Erik Nilsen2010-01-215-12/+12
| | | | | | | | * Optimize QGraphicsItem::setFlags.Bjørn Erik Nilsen2010-01-211-9/+21
| | | | | | | | * Optimize QGraphicsScenePrivate::itemAcceptsHoverEvents_helperBjørn Erik Nilsen2010-01-211-4/+4
| | | | | | | | * Improve performance of QGraphicsItem::setParentItem.Bjørn Erik Nilsen2010-01-213-35/+62
| | | | | | | | * Make sure cursor is painted at the correct position when we are using IM.Jan-Arve Sæther2010-01-212-2/+8
| | | | | | | | * Purely cosmetic (formatting) changes to GL2 engine's GLSLTom Cooksey2010-01-211-333/+357
| | | | | | | | * Use an attribute value for the PMV matrix rather than a uniformTom Cooksey2010-01-215-31/+42
| | | | | | | | * Remove unnecessary depth uniform from GL2 engine's GLSLTom Cooksey2010-01-211-6/+0
| | | | | | | | * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6Jan-Arve Sæther2010-01-2119-72/+170
| | | | | | | | |\
| | | | | | | | | * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6Gunnar Sletta2010-01-213411-5767/+8402
| | | | | | | | | |\
| | | | | | | | | * | Fix how we select antialiasing method for text under Mac OS XGunnar Sletta2010-01-211-11/+31
| | | | | | | | * | | Doc fixes: Remove some lies from QEasingCurve.Jan-Arve Sæther2010-01-211-3/+3
| | | | | * | | | | | Fix documentation bug in QColorGunnar Sletta2010-01-221-7/+4
| | | | | * | | | | | Don't use a mutex lock in QPainter::redirection unless strictly requiredGunnar Sletta2010-01-221-3/+36
* | | | | | | | | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6Martin Smith2010-01-2833-546/+807
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Fixes visibility update missing when doing setParentItem on graphicsitemLeonardo Sobral Cunha2010-01-273-36/+41
| * | | | | | | | | | | Fixed an infinite loop that could occur when reading invalid BMP images.Trond Kjernåsen2010-01-271-1/+1
| * | | | | | | | | | | Updated docs regarding QGLWidget::renderText() limitations.Trond Kjernåsen2010-01-271-0/+7
| * | | | | | | | | | | Added optimization flag to QGraphicsItemPrivate.Samuel Rødal2010-01-272-0/+25
| * | | | | | | | | | | Fixed child items with graphics effects not inheriting opacity.Samuel Rødal2010-01-272-4/+25
| * | | | | | | | | | | Small optimization in raster paint engine.Samuel Rødal2010-01-271-2/+2
| * | | | | | | | | | | Another ASSERT while deleting spansGabriel de Dietrich2010-01-271-1/+3