diff options
author | Erik Verbruggen <erik.verbruggen@nokia.com> | 2009-05-04 13:09:03 (GMT) |
---|---|---|
committer | Erik Verbruggen <erik.verbruggen@nokia.com> | 2009-05-04 13:09:03 (GMT) |
commit | 06f5efc5e298f338ef82fe77aff775db5b7d50dd (patch) | |
tree | e11607a3ad9e3743a4f9ce190ddc2b698e930b17 | |
parent | 05f156b7a5893139376e62a61f501c272f496a53 (diff) | |
parent | 895e6a4254adf8a2e01e76bc0770d983372d8500 (diff) | |
download | Qt-06f5efc5e298f338ef82fe77aff775db5b7d50dd.zip Qt-06f5efc5e298f338ef82fe77aff775db5b7d50dd.tar.gz Qt-06f5efc5e298f338ef82fe77aff775db5b7d50dd.tar.bz2 |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
-rw-r--r-- | src/declarative/fx/qfxitem.cpp | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/src/declarative/fx/qfxitem.cpp b/src/declarative/fx/qfxitem.cpp index 53e198f..84dc484 100644 --- a/src/declarative/fx/qfxitem.cpp +++ b/src/declarative/fx/qfxitem.cpp @@ -1604,12 +1604,20 @@ void QFxItem::setKeepMouseGrab(bool keep) d->_keepMouse = keep; } -void QFxItem::activeFocusChanged(bool) +/*! + This function emits the \e activeFocusChanged signal. + \a flag is not used. + */ +void QFxItem::activeFocusChanged(bool flag) { emit activeFocusChanged(); } -void QFxItem::focusChanged(bool) +/*! + This function emits the \e focusChanged signal. + \a flag is not used. + */ +void QFxItem::focusChanged(bool flag) { emit focusChanged(); } |