summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-08-11 16:24:49 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-08-11 16:24:49 (GMT)
commit0bbc19d5721c8c00f2b3c6cb28cca2d0adfda315 (patch)
tree70336bf214d1997d1f1cee37436a9655ca429e16 /src
parentccb838e6d4e661c9280d5c69fa0b1717b85a1dd9 (diff)
parent9e41bd55cc605f65543e020bb5407c34a043bef9 (diff)
downloadQt-0bbc19d5721c8c00f2b3c6cb28cca2d0adfda315.zip
Qt-0bbc19d5721c8c00f2b3c6cb28cca2d0adfda315.tar.gz
Qt-0bbc19d5721c8c00f2b3c6cb28cca2d0adfda315.tar.bz2
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Remember to reset clipping when overriding paint in QDeclarativeItem
Diffstat (limited to 'src')
-rw-r--r--src/declarative/graphicsitems/qdeclarativeitem.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/declarative/graphicsitems/qdeclarativeitem.cpp b/src/declarative/graphicsitems/qdeclarativeitem.cpp
index 2b41710..cc7c673 100644
--- a/src/declarative/graphicsitems/qdeclarativeitem.cpp
+++ b/src/declarative/graphicsitems/qdeclarativeitem.cpp
@@ -2500,7 +2500,9 @@ QDeclarativeListProperty<QDeclarativeTransition> QDeclarativeItemPrivate::transi
This property holds whether clipping is enabled.
if clipping is enabled, an item will clip its own painting, as well
- as the painting of its children, to its bounding rectangle.
+ as the painting of its children, to its bounding rectangle. If you set
+ clipping during an item's paint operation, remember to re-set it to
+ prevent clipping the rest of your scene.
Non-rectangular clipping regions are not supported for performance reasons.
*/