diff options
| author | Martin Jones <martin.jones@nokia.com> | 2010-04-14 04:09:52 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2010-04-14 04:09:52 (GMT) |
| commit | fad51dfe05476ee1b7b800181dd544ac004de145 (patch) | |
| tree | a6741b611d7737c4c31378f3f5eb0c3852f4b8bc /src/declarative/graphicsitems/qdeclarativeitem.cpp | |
| parent | 6fb6bbadfc9cffee3f7e51d4ec7ab2718f26d00d (diff) | |
| parent | c6ce84640b7bebab4d6dc571ab549a085703ed16 (diff) | |
| download | Qt-fad51dfe05476ee1b7b800181dd544ac004de145.zip Qt-fad51dfe05476ee1b7b800181dd544ac004de145.tar.gz Qt-fad51dfe05476ee1b7b800181dd544ac004de145.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
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 55a81f4..86dbaf0 100644 --- a/src/declarative/graphicsitems/qdeclarativeitem.cpp +++ b/src/declarative/graphicsitems/qdeclarativeitem.cpp @@ -2507,7 +2507,7 @@ QDeclarativeStateGroup *QDeclarativeItemPrivate::states() return _stateGroup; } -QDeclarativeItemPrivate::AnchorLines::AnchorLines(QDeclarativeItem *q) +QDeclarativeItemPrivate::AnchorLines::AnchorLines(QGraphicsObject *q) { left.item = q; left.anchorLine = QDeclarativeAnchorLine::Left; |