summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Martin Jones2010-01-29172-2657/+3979
|\
| * Doc.Michael Brasser2010-01-291-2/+4
| * Remove benchmarks that have been migrated to 4.6.Michael Brasser2010-01-297-1016/+0
| * Convert lists to variants on assignment.Aaron Kennedy2010-01-285-7/+53
| * Optimization: Skip attached property search where possibleAaron Kennedy2010-01-283-17/+22
| * Support builtin string converters in every contextAaron Kennedy2010-01-287-34/+381
| * Assigning undefined resets QObject propertiesAaron Kennedy2010-01-285-6/+65
| * Add reset methods to QmlMetaPropertyAaron Kennedy2010-01-283-0/+120
| * Cache reset'abilityAaron Kennedy2010-01-282-9/+12
| * Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic int...Aaron Kennedy2010-01-27149-1242/+3100
| |\
| | * Speed up QmlGraphicsItem::setParentItem.Bjørn Erik Nilsen2010-01-271-1/+5
| | * Merge commit 'qt/4.6' into kinetic-declarativeuiBjørn Erik Nilsen2010-01-27137-1076/+2902
| | |\
| | | * Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-i...Pulse Build System2010-01-2736-561/+1008
| | | |\
| | | | * Compile with no-webkit - add missing semi-colons.Rhys Weatherley2010-01-261-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-2635-559/+1006
| | | | |\
| | | | | * Fixes visibility update missing when doing setParentItem on graphicsitemLeonardo Sobral Cunha2010-01-264-36/+127
| | | | | * Stabilize tst_QGraphicsScene::polishItems2 (new test)Bjørn Erik Nilsen2010-01-261-2/+2
| | | | | * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-01-2634-525/+881
| | | | | |\
| | | | | | * 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-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