diff options
| author | Michael Brasser <michael.brasser@nokia.com> | 2009-05-22 01:11:46 (GMT) |
|---|---|---|
| committer | Michael Brasser <michael.brasser@nokia.com> | 2009-05-22 01:11:46 (GMT) |
| commit | 47318932fc44428fc698fc5d4366e9b59f5c7fb9 (patch) | |
| tree | 7357009416021728fcf1bb3163f0841cc7e946e9 /src/declarative/fx/qfxitem.cpp | |
| parent | 61943383ccff409d60d9837d58e4372dc6f22f23 (diff) | |
| parent | 5a506eefe1ca8f654dcfc354f8ac39547510becf (diff) | |
| download | Qt-47318932fc44428fc698fc5d4366e9b59f5c7fb9.zip Qt-47318932fc44428fc698fc5d4366e9b59f5c7fb9.tar.gz Qt-47318932fc44428fc698fc5d4366e9b59f5c7fb9.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'src/declarative/fx/qfxitem.cpp')
| -rw-r--r-- | src/declarative/fx/qfxitem.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/declarative/fx/qfxitem.cpp b/src/declarative/fx/qfxitem.cpp index 561a124..3e29f13 100644 --- a/src/declarative/fx/qfxitem.cpp +++ b/src/declarative/fx/qfxitem.cpp @@ -197,8 +197,10 @@ void QFxContents::setItem(QFxItem *item) const QList<QSimpleCanvasItem *> &children = _item->QSimpleCanvasItem::children(); for (int i = 0; i < children.count(); ++i) { const QSimpleCanvasItem *child = children.at(i); - connect(child, SIGNAL(bottomChanged()), this, SLOT(calcHeight())); - connect(child, SIGNAL(rightChanged()), this, SLOT(calcWidth())); + connect(child, SIGNAL(heightChanged()), this, SLOT(calcHeight())); + connect(child, SIGNAL(topChanged()), this, SLOT(calcHeight())); + connect(child, SIGNAL(widthChanged()), this, SLOT(calcWidth())); + connect(child, SIGNAL(leftChanged()), this, SLOT(calcWidth())); } calcHeight(); @@ -1661,6 +1663,7 @@ void QFxItem::setKeepMouseGrab(bool keep) */ void QFxItem::activeFocusChanged(bool flag) { + Q_UNUSED(flag); emit activeFocusChanged(); } @@ -1670,6 +1673,7 @@ void QFxItem::activeFocusChanged(bool flag) */ void QFxItem::focusChanged(bool flag) { + Q_UNUSED(flag); emit focusChanged(); } |