diff options
| author | Warwick Allison <warwick.allison@nokia.com> | 2010-05-25 03:26:48 (GMT) |
|---|---|---|
| committer | Warwick Allison <warwick.allison@nokia.com> | 2010-05-25 03:26:48 (GMT) |
| commit | 527d7d17d4c4b3ff44c6a0d7eb7f2d024549aac7 (patch) | |
| tree | 7002a9cc027cdd86e268512fa76677e995f70555 | |
| parent | 9d8bf1b8b7eec4202d54dd472be625214ea9c6fc (diff) | |
| parent | 468ed48e8a98b674c23c493968a421a6fc70f3c9 (diff) | |
| download | Qt-527d7d17d4c4b3ff44c6a0d7eb7f2d024549aac7.zip Qt-527d7d17d4c4b3ff44c6a0d7eb7f2d024549aac7.tar.gz Qt-527d7d17d4c4b3ff44c6a0d7eb7f2d024549aac7.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
| -rw-r--r-- | src/declarative/util/qdeclarativestateoperations.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/declarative/util/qdeclarativestateoperations.cpp b/src/declarative/util/qdeclarativestateoperations.cpp index 80ae5f5..99f163e 100644 --- a/src/declarative/util/qdeclarativestateoperations.cpp +++ b/src/declarative/util/qdeclarativestateoperations.cpp @@ -1128,8 +1128,8 @@ void QDeclarativeAnchorChanges::setObject(QDeclarativeItem *target) \qml AnchorChanges { target: myItem - left: undefined //remove myItem's left anchor - right: otherItem.right + anchors.left: undefined //remove myItem's left anchor + anchors.right: otherItem.right } \endqml */ |