summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-01-2533-524/+880
|\
| * 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-253-6/+57
| * Made the trace replayer handle limited resolution cases better.Samuel Rødal2010-01-251-6/+22
| * Small optimization in raster paint engine.Samuel Rødal2010-01-251-2/+2
| * Another ASSERT while deleting spansGabriel de Dietrich2010-01-252-1/+11
| * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-01-2527-509/+756
| |\
| | * Implement QDirectFBPixmapData::scrollAnders Bakken2010-01-222-3/+29
| | * Potential crash when adding items from QGraphicsWidget::polishEvent().Bjørn Erik Nilsen2010-01-223-18/+68
| | * QGraphicsWidget is painted twice on the inital show.Bjørn Erik Nilsen2010-01-224-8/+43
| | * Fix QPainter::redirection() to pass autotest.Gunnar Sletta2010-01-221-3/+2
| | * Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6Gunnar Sletta2010-01-22162-1120/+2301
| | |\
| | | * Re-added the Close button in QPrintPreviewDialog for Mac/Carbon.Trond Kjernåsen2010-01-221-0/+10
| | | * revert parts of 10392eef4fd4f9Joerg Bornemann2010-01-221-26/+24
| | | * Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6Gunnar Sletta2010-01-226-9/+10
| | | |\
| | | | * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-01-2219-451/+584
| | | | |\
| | | | | * 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-2285-678/+1255
| | | |\ \
| | | | * \ 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-2128-84/+331
| | | | | | |\ \
| | | | | | | * \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6Gunnar Sletta2010-01-219073-13996/+21198
| | | | | | | |\ \
| | | | | | | * | | 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
| | * | | | | | | | Don't use a mutex lock in QPainter::redirection unless strictly requiredGunnar Sletta2010-01-211-3/+36
* | | | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-01-2511-58/+533
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Improve DEF file enable/disable mechanism on SymbianIain2010-01-225-27/+68
| * | | | | | | | | S60Style: Add support for animations to style (part2)Sami Merila2010-01-221-0/+1
| * | | | | | | | | S60Style: Add support for animations to styleSami Merila2010-01-226-31/+464
|/ / / / / / / / /
* | | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-01-227-7/+52
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | |
| * | | | | | | | Move avkon component transparency check to app initialization.Jani Hautakangas2010-01-224-34/+23
| * | | | | | | | Fix for symbian dialog background transparency.Jani Hautakangas2010-01-226-7/+63
* | | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into 4.6-int...Qt Continuous Integration System2010-01-224-7/+7
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | |
| * | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into 4.6-int...Qt Continuous Integration System2010-01-224-7/+7
| |\ \ \ \ \ \ \ \ |/ / / / / / / / /
| * | | | | | | | Assistant docs: Fix link.ck2010-01-211-1/+1
| * | | | | | | | QtHelp docs: Fix illegal namespace name.ck2010-01-212-2/+2