summaryrefslogtreecommitdiffstats
path: root/src/declarative/graphicsitems
diff options
context:
space:
mode:
authorMartin Jones <martin.jones@nokia.com>2010-02-24 07:49:15 (GMT)
committerMartin Jones <martin.jones@nokia.com>2010-02-24 07:49:15 (GMT)
commitf4b73327cdddd14e29c542e392377cf7261d28ca (patch)
treee57845768a21ee7eae2cd7693e0b0d8f68a544ca /src/declarative/graphicsitems
parentd3a0bd57c7c3cecdeeb4ad9af3cf6bb4ee39964b (diff)
parentb0005461049e6d69f7e79e7d9311e9beabfe8c39 (diff)
downloadQt-f4b73327cdddd14e29c542e392377cf7261d28ca.zip
Qt-f4b73327cdddd14e29c542e392377cf7261d28ca.tar.gz
Qt-f4b73327cdddd14e29c542e392377cf7261d28ca.tar.bz2
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml
Diffstat (limited to 'src/declarative/graphicsitems')
-rw-r--r--src/declarative/graphicsitems/qdeclarativeitem.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/declarative/graphicsitems/qdeclarativeitem.cpp b/src/declarative/graphicsitems/qdeclarativeitem.cpp
index 3db60ee..d492dbd 100644
--- a/src/declarative/graphicsitems/qdeclarativeitem.cpp
+++ b/src/declarative/graphicsitems/qdeclarativeitem.cpp
@@ -1321,7 +1321,7 @@ QDeclarativeItem::~QDeclarativeItem()
Image {
source: "myimage.png"
transformOrigin: Item.BottomRight
- rotate: 45
+ rotation: 45
}
\endqml