diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-07-15 14:04:26 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-07-15 14:04:26 (GMT) |
| commit | 73ae54ce26562ff3eab33fc142b3ec94c2913810 (patch) | |
| tree | 89c38eebd366ee25e40a16c1daccd5fa78ae7fb9 /src/declarative/graphicsitems/qdeclarativeitem.cpp | |
| parent | 03c01176ebf423085e56ceabcf8335ca5027a786 (diff) | |
| parent | 5893e05aa453f1ecbc0ee35d5fca5d671828dfc2 (diff) | |
| download | Qt-73ae54ce26562ff3eab33fc142b3ec94c2913810.zip Qt-73ae54ce26562ff3eab33fc142b3ec94c2913810.tar.gz Qt-73ae54ce26562ff3eab33fc142b3ec94c2913810.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:
Fix .pro file
Add files missing from last commit
fix doc link
Add chapter on creating list property types
fix spelling
Change tutorial from using "Musician" etc. types to using "PieChart"
Text element does not clip even with clip=true
Diffstat (limited to 'src/declarative/graphicsitems/qdeclarativeitem.cpp')
| -rw-r--r-- | src/declarative/graphicsitems/qdeclarativeitem.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/declarative/graphicsitems/qdeclarativeitem.cpp b/src/declarative/graphicsitems/qdeclarativeitem.cpp index 190b22c..ddaeb05 100644 --- a/src/declarative/graphicsitems/qdeclarativeitem.cpp +++ b/src/declarative/graphicsitems/qdeclarativeitem.cpp @@ -2503,7 +2503,7 @@ QDeclarativeListProperty<QDeclarativeTransition> QDeclarativeItemPrivate::transi \qmlproperty bool Item::clip This property holds whether clipping is enabled. - if clipping is enabled, an item will clip its own painting, as well + If clipping is enabled, an item will clip its own painting, as well as the painting of its children, to its bounding rectangle. Non-rectangular clipping regions are not supported for performance reasons. |