summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorDavid Boddie <david.boddie@nokia.com>2011-02-23 16:12:50 (GMT)
committerDavid Boddie <david.boddie@nokia.com>2011-02-23 16:12:50 (GMT)
commit3c982b5d214cc7a37ace1d956ac8fb0b9a281722 (patch)
treec89463b0ed99c7bfa1306d4a8bb40bac0389e56f /src
parent3d94f52564e2ed9b3454b0d9761a0af364058241 (diff)
parent719a3079e5675936bc72b65121ac0a0245e29d62 (diff)
downloadQt-3c982b5d214cc7a37ace1d956ac8fb0b9a281722.zip
Qt-3c982b5d214cc7a37ace1d956ac8fb0b9a281722.tar.gz
Qt-3c982b5d214cc7a37ace1d956ac8fb0b9a281722.tar.bz2
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7
Diffstat (limited to 'src')
-rw-r--r--src/gui/graphicsview/qgraphicsitem.cpp20
1 files changed, 11 insertions, 9 deletions
diff --git a/src/gui/graphicsview/qgraphicsitem.cpp b/src/gui/graphicsview/qgraphicsitem.cpp
index f463887..265029b 100644
--- a/src/gui/graphicsview/qgraphicsitem.cpp
+++ b/src/gui/graphicsview/qgraphicsitem.cpp
@@ -574,19 +574,21 @@
QGraphicsItem pointer). The return value is unused; you cannot adjust
anything in this notification.
- \value ItemSceneChange The item is moved to a new scene. This notification
- is also sent when the item is added to its initial scene, and when it is
- removed. The value argument is the new scene (i.e., a QGraphicsScene
+ \value ItemSceneChange The item is moved to a new scene. This notification is
+ also sent when the item is added to its initial scene, and when it is removed.
+ The item's scene() is the old scene (or 0 if the item has not been added to a
+ scene yet). The value argument is the new scene (i.e., a QGraphicsScene
pointer), or a null pointer if the item is removed from a scene. Do not
- override this change by passing this item to QGraphicsScene::addItem() as
- this notification is delivered; instead, you can return the new scene from
+ override this change by passing this item to QGraphicsScene::addItem() as this
+ notification is delivered; instead, you can return the new scene from
itemChange(). Use this feature with caution; objecting to a scene change can
quickly lead to unwanted recursion.
- \value ItemSceneHasChanged The item's scene has changed. The value
- argument is the new scene (i.e., a pointer to a QGraphicsScene). Do not
- call setScene() in itemChange() as this notification is delivered. The
- return value is ignored.
+ \value ItemSceneHasChanged The item's scene has changed. The item's scene() is
+ the new scene. This notification is also sent when the item is added to its
+ initial scene, and when it is removed.The value argument is the new scene
+ (i.e., a pointer to a QGraphicsScene). Do not call setScene() in itemChange()
+ as this notification is delivered. The return value is ignored.
\value ItemCursorChange The item's cursor changes. The value argument is
the new cursor (i.e., a QCursor). Do not call setCursor() in itemChange()
nohover'> | * | | Merge commit 'qt/master' into kinetic-graphicseffectBjørn Erik Nilsen2009-08-192-69/+38 | |\ \ \ | * \ \ \ Merge commit 'qt/master' into kinetic-graphicseffectBjørn Erik Nilsen2009-08-171078-1137/+1137 | |\ \ \ \ | * \ \ \ \ Merge commit 'qt/master' into kinetic-graphicseffectBjørn Erik Nilsen2009-08-07134-8386/+2251 | |\ \ \ \ \ | * | | | | | Infinite recursion in examples/graphicsview/customshaderBjørn Erik Nilsen2009-07-311-1/+1 | * | | | | | Compile examples/graphicsview/customshader.Bjørn Erik Nilsen2009-07-312-5/+5 | * | | | | | Merge branch 'kinetic-graphicseffect' of git@scm.dev.nokia.troll.no:qt/kineti...Bjørn Erik Nilsen2009-07-2926-334/+457 | |\ \ \ \ \ \ | | * | | | | | Update QGraphicsShaderEffect to match new APIRhys Weatherley2009-07-246-28/+22 | | * | | | | | Merge branch 'kinetic-graphicseffect' of git@scm.dev.nokia.troll.no:qt/kineti...Rhys Weatherley2009-07-248-42/+32 | | |\ \ \ \ \ \ | | * | | | | | | Implement a variant on blurpicker that shows a custom shader.Rhys Weatherley2009-07-2410-0/+569 | | * | | | | | | Merge branch 'custom_shaders' of ../qt-graphics-team into custom-shadersRhys Weatherley2009-07-2319-474/+34 | | |\ \ \ \ \ \ \ | * | | | | | | | | QGraphicsEffect cleanup.Bjørn Erik Nilsen2009-07-292-107/+2 | * | | | | | | | | Make examples/graphicsview/lightning compatible the new effects API.Bjørn Erik Nilsen2009-07-292-6/+6 | * | | | | | | | | Add QGraphicsEffectSource::pixmap.Bjørn Erik Nilsen2009-07-292-3/+3 | * | | | | | | | | Add QGraphicsSourceEffect.Bjørn Erik Nilsen2009-07-292-2/+107 | | |_|/ / / / / / | |/| | | | | | | | * | | | | | | | Make QGraphicsEffect independent of QGraphicsItem.Bjørn Erik Nilsen2009-07-246-35/+31 | * | | | | | | | QGraphicsEffect API cleanup.Bjørn Erik Nilsen2009-07-238-14/+8 | |/ / / / / / / | * | | | | | | Merge commit 'qt/master' into graphicseffectsBjørn Erik Nilsen2009-07-21