diff options
| author | Martin Jones <martin.jones@nokia.com> | 2009-10-22 03:01:04 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2009-10-22 03:01:04 (GMT) |
| commit | 6425ab5e2392584a0bf6455d426163bf6f257e82 (patch) | |
| tree | dc7c283f3ae4a9142d070b534ab9d69e728a80e8 /src/declarative/fx | |
| parent | 42849ecec82fb289fd337fb9dc591bd48ba89b56 (diff) | |
| parent | 6c9ac788a60fcd2f946787a5297d7c2f71ad1968 (diff) | |
| download | Qt-6425ab5e2392584a0bf6455d426163bf6f257e82.zip Qt-6425ab5e2392584a0bf6455d426163bf6f257e82.tar.gz Qt-6425ab5e2392584a0bf6455d426163bf6f257e82.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'src/declarative/fx')
| -rw-r--r-- | src/declarative/fx/qfxanchors.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/declarative/fx/qfxanchors.cpp b/src/declarative/fx/qfxanchors.cpp index 09776e5..085bbc7 100644 --- a/src/declarative/fx/qfxanchors.cpp +++ b/src/declarative/fx/qfxanchors.cpp @@ -181,6 +181,9 @@ void QFxAnchorsPrivate::centerInChanged() void QFxAnchorsPrivate::clearItem(QFxItem *item) { + Q_Q(QFxAnchors); + if (!item) + return; if (fill == item) fill = 0; if (centerIn == item) @@ -213,6 +216,9 @@ void QFxAnchorsPrivate::clearItem(QFxItem *item) baseline.item = 0; usedAnchors &= ~QFxAnchors::HasBaselineAnchor; } + QFxItemPrivate *p = + static_cast<QFxItemPrivate *>(QGraphicsItemPrivate::get(item)); + p->dependantAnchors.removeAll(q); } void QFxAnchorsPrivate::addDepend(QFxItem *item) @@ -232,7 +238,7 @@ void QFxAnchorsPrivate::remDepend(QFxItem *item) return; QFxItemPrivate *p = static_cast<QFxItemPrivate *>(QGraphicsItemPrivate::get(item)); - p->dependantAnchors.removeAll(q); + p->dependantAnchors.removeOne(q); } bool QFxAnchorsPrivate::isItemComplete() const |