summaryrefslogtreecommitdiffstats
path: root/src/gui/graphicsview/qgraphicsscene.cpp
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-04-071-3/+0
|\
| * QGraphicsItem::ItemStops[ClickFocusProgration|FocusHandling] must not interfe...Michael Hasselmann2011-04-011-3/+0
* | Draw graphics item bounding rects drawn when QT_DRAW_SCENE_ITEM_RECTS=1J-P Nurmi2011-04-051-0/+13
* | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Thiago Macieira2011-03-171-4/+13
|\ \ | |/
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-water-staging into 4.7-int...Qt Continuous Integration System2011-03-161-4/+13
| |\
| | * Introduce QGraphicsItem::ItemStopsFocusHandling flagMichael Hasselmann2011-03-161-4/+13
* | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Thiago Macieira2011-03-111-3/+8
|\ \ \ | |/ /
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2011-03-101-3/+8
| |\ \ | | |/ | |/|
| | * Fix QGraphicsScene returning incorrect focus item.Yoann Lopes2011-03-101-3/+8
* | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-02-101-15/+14
|\ \ \ | |/ /
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-02-101-0/+4
| |\ \
| | * | Stop focus propagation of touch events when flag is set.Niklas Kurkisuo2011-02-091-0/+4
| | |/
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-02-091-12/+7
| |\ \
| | * | Don't clear pre-edit text when a graphics items loses focus.Andrew den Exter2011-02-091-12/+7
| | |/
| * | Doc: Fixed warnings and other problems found while fixing markup.David Boddie2011-02-071-3/+3
| |/
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-01-171-1/+1
|\ \ | |/
| * Update copyright year to 2011.Jason McDonald2011-01-101-1/+1
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-12-131-2/+2
|\ \ | |/
| * Fixed DeviceCoordinateCache items when using QGraphicsScene::render().Samuel Rødal2010-12-091-2/+2
* | Fix transformIsSimple in QGraphicsSceneJørgen Lind2010-11-221-18/+1
* | Make sure QGraphicsSceneHoverLeave event has non-null widget pointer.Denis Dzyubenko2010-10-191-7/+7
* | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-10-081-18/+58
|\ \ | |/
| * QGraphicsItem device coordinate cache unefficient in portrait modeBjørn Erik Nilsen2010-10-061-18/+58
* | Merge remote branch 'origin/4.7' into master-from-4.7Rohan McGovern2010-10-051-1/+1
|\ \ | |/
| * Fix QTBUG-13730. QGraphicsScene::render clipping bug. Includes test case.Chris Meyer2010-10-041-1/+1
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-09-281-45/+81
|\ \ | |/
| * QPainter not restored correctly in Graphics View.Bjørn Erik Nilsen2010-09-221-0/+2
| * Setting QGraphicsItem::ItemClipsChildrenToShape forces ItemClipsToShapeBjørn Erik Nilsen2010-09-221-45/+79
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Thiago Macieira2010-09-211-5/+6
|\ \ | |/
| * Fixed compile warning on Windows.Kim Motoyoshi Kalland2010-09-201-1/+1
| * git Merge branch '4.7-upstream' into 4.7-docJesper Thomschutz2010-09-151-2/+3
| |\
| | * QGraphicsWidget update issues with ItemHasNoContents + effectBjørn Erik Nilsen2010-09-141-2/+3
| * | Merge branch '4.7-upstream' into 4.7-docA-Team2010-09-131-1/+1
| |\ \ | | |/
| | * Assertion calledEmitUpdated fails in QGraphicsScene.Bjørn Erik Nilsen2010-09-131-1/+1
| * | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into doc-4.7Morten Engvoldsen2010-09-021-1/+1
| |\ \ | | |/ | |/|
| | * Fixed spelling, broken links, and missing default values.Jerome Pasion2010-08-301-1/+1
* | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-08-301-14/+5
|\ \ \ | |/ /
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-08-271-7/+3
| |\ \ | | |/ | |/|
| | * Don't rely on mapFromGlobal in QGraphicsScenePrivate::itemsAtPosition.Bjørn Erik Nilsen2010-08-251-7/+3
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-08-251-7/+2
| |\ \ | | |/ | |/|
| | * Fixed touch event delivery in QGraphicsView.Denis Dzyubenko2010-08-231-7/+2
* | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-08-251-1/+3
|\ \ \ | |/ /
| * | QGraphicsView: Fix assert that may occurs if there are 'empty' item to draw, ...Olivier Goffart2010-08-241-1/+3
| |/
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-08-131-0/+5
|\ \ | |/
| * Don't crash if an item is removed from the scene while it is gaining focus.Martin Jones2010-08-041-0/+5
* | Remove the use of deprecated qVariant*Olivier Goffart2010-08-061-4/+4
|/
* QGraphicsItem: Animation leaves drawing artifacts when clipping is used.Bjørn Erik Nilsen2010-07-201-1/+6
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-07-011-0/+2
|\
| * Add a new (internal) flag QGraphicsItem::ItemStopsClickFocusPropagation.Bjørn Erik Nilsen2010-06-241-0/+2
* | QGraphicsView: Handle wheelEvents correctly with Qt::Popup widgets.Jocelyn Turcotte2010-06-301-0/+19