summaryrefslogtreecommitdiffstats
path: root/src/gui/graphicsview
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.6' of git://scm.dev.nokia.troll.no/qt/qt into kinetic-declara...Warwick Allison2009-11-305-226/+32
|\
| * Merge commit oslo-staging-2/4.6 into upstream/4.6Olivier Goffart2009-11-275-226/+32
| |\
| | * Fix a crash in KDE/Plasma with QGraphicsView. TopLevel list of itemsAlexis Menard2009-11-261-1/+2
| | * QGraphicsTextItem::setDefaultTextColor check change before calling update()Olivier Goffart2009-11-261-1/+3
| | * Remove unused variables in QGraphicsItem and QGraphicsScene.Bjørn Erik Nilsen2009-11-254-34/+20
| | * Remove caching of QGraphicsItem::clipPath().Bjørn Erik Nilsen2009-11-253-191/+8
* | | Merge branch '4.6' of git://scm.dev.nokia.troll.no/qt/qt into kinetic-declara...Warwick Allison2009-11-277-26/+41
|\ \ \ | |/ /
| * | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6David Boddie2009-11-253-12/+25
| |\ \ | | |/
| | * Mac: Fixes painting artifacts in Graphics ViewBjørn Erik Nilsen2009-11-241-0/+7
| | * Merge branch 'fixes' of git://gitorious.org/~fleury/qt/fleury-openbossa-clone...Jan-Arve Sæther2009-11-232-12/+18
| | |\
| | | * QGAL: sizeHint constraints needed by anchors parallel with the layoutEduardo M. Fleury2009-11-201-6/+14
| | | * QGAL: deal correctly with anchors in parallel with the layoutCaio Marcelo de Oliveira Filho2009-11-202-6/+4
| * | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6David Boddie2009-11-242-1/+2
| |\ \ \ | | |/ /
| | * | Fixes painting issues when scaling a QGraphicsView.Yoann Lopes2009-11-201-1/+1
| | * | Mark QGraphicsItemAnimation as deprecatedThierry Bastian2009-11-191-0/+1
| | |/
| * | Doc: Fixes to markup.David Boddie2009-11-241-3/+3
| |/
| * Ran the script utils/normalizeOlivier Goffart2009-11-181-2/+2
| * Crash when rendering a scene using DeviceCoordinateCacheGabriel de Dietrich2009-11-181-3/+6
| * Merge upstream/4.6 into oslo-staging-2Olivier Goffart2009-11-171-2/+3
| |\
| * \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6Yoann Lopes2009-11-171-0/+2
| |\ \
| * | | Fixes polish events for explicitly hidden GraphicsWidgetItems.Yoann Lopes2009-11-171-5/+3
* | | | Merge branch '4.6' of git://scm.dev.nokia.troll.no/qt/qt into kinetic-declara...Warwick Allison2009-11-197-371/+197
|\ \ \ \ | | |_|/ | |/| |
| * | | Merge oslo-staging-2/4.6 into upstream/4.6Olivier Goffart2009-11-171-0/+2
| |\ \ \ | | | |/ | | |/|
| | * | Fix tst_QGraphicsView::inputMethodSensitivity autotestOlivier Goffart2009-11-171-0/+2
| | |/
| * | Merge remote branch 'staging/4.6' into 4.6Simon Hausmann2009-11-171-2/+3
| |\ \ | | |/ | |/|
| | * Fix S60 input method not showing up in editable QGraphicsTextItemsSimon Hausmann2009-11-131-2/+3
| * | Remove warning. (Forgot to commit this together with my previous commits)Jan-Arve Sæther2009-11-131-1/+1
| * | Merge branch 'fixes' of git://gitorious.org/~fleury/qt/fleury-openbossa-clone...Jan-Arve Sæther2009-11-134-368/+182
| |\ \
| | * | QGAL: clean up size hint refresh codeCaio Marcelo de Oliveira Filho2009-11-122-65/+25
| | * | QGAL: clean up interpolation codeCaio Marcelo de Oliveira Filho2009-11-122-95/+16
| | * | QGAL: remove the caching of simplified graphCaio Marcelo de Oliveira Filho2009-11-123-72/+22
| | * | QGAL: fix update size hints logic in parallel anchorsCaio Marcelo de Oliveira Filho2009-11-121-6/+13
| | * | QGAL: Update code documentationEduardo M. Fleury2009-11-121-13/+26
| | * | QGAL: Move size information from AnchorData to QGraphicsAnchorPrivateEduardo M. Fleury2009-11-123-108/+66
| | * | QGAL: Update header documentation in QGALPrivateEduardo M. Fleury2009-11-121-9/+14
| * | | Fixes QGraphicsWidget: paint() being called before polish().Bjørn Erik Nilsen2009-11-131-0/+8
| | |/ | |/|
| * | Merge commit 'widget/4.6' into oslo-staging-2/4.6Olivier Goffart2009-11-113-4/+2
| |\ \ | | |/ | |/|
| | * Revert "Always set a clip on the painter in QGraphicsView."Andreas Aardal Hanssen2009-11-111-3/+0
| | * QGraphicsTextItem: update when changing the color.Olivier Goffart2009-11-091-0/+1
| | * Fix warningsThierry Bastian2009-11-091-1/+1
* | | Merge remote branch 'qt/4.6' into kinetic-declarativeuiAndreas Aardal Hanssen2009-11-115-8/+8
|\ \ \ | |/ /
| * | Improvements to graphics effects API after review round.Samuel Rødal2009-11-103-5/+5
| |/
| * Compile in 64bit with debugOlivier Goffart2009-11-091-1/+1
| * Merge branch '4.6-api-review' into 4.6Marius Storm-Olsen2009-11-092-2/+2
| |\
| | * API review: Rename numRects() -> rectCount()Marius Storm-Olsen2009-11-092-2/+2
| * | More inDestructor checks.Warwick Allison2009-11-091-0/+9
* | | Revert 4bf7f90a27377f439e86d6175e5e3cdebd131be0 and implement differently.Warwick Allison2009-11-101-3/+0
* | | Remove no-op diff to 4.6.Warwick Allison2009-11-091-1/+0
* | | Merge branch '4.6' of git://scm.dev.nokia.troll.no/qt/qt into kinetic-declara...Warwick Allison2009-11-0916-480/+1115
|\ \ \ | |/ /
| * | Use at() instead of operator[] for vectors and lists.Jan-Arve Sæther2009-11-071-24/+24