summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAaron Kennedy <aaron.kennedy@nokia.com>2010-02-24 07:40:59 (GMT)
committerAaron Kennedy <aaron.kennedy@nokia.com>2010-02-24 07:40:59 (GMT)
commitff5f3eabb9750d7e4e4edbfc84e1c0b502a14780 (patch)
tree31d332083209d56c3373381d0d528e850654175e
parent93353ce0cf416c53238eb908a8e4ccb3e68df73d (diff)
parentd38fdecaccd9d53127c26b8dc1a30b3aa4bdb9a0 (diff)
downloadQt-ff5f3eabb9750d7e4e4edbfc84e1c0b502a14780.zip
Qt-ff5f3eabb9750d7e4e4edbfc84e1c0b502a14780.tar.gz
Qt-ff5f3eabb9750d7e4e4edbfc84e1c0b502a14780.tar.bz2
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml
-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