diff options
| author | Michael Brasser <michael.brasser@nokia.com> | 2009-04-30 04:30:40 (GMT) |
|---|---|---|
| committer | Michael Brasser <michael.brasser@nokia.com> | 2009-04-30 04:30:40 (GMT) |
| commit | 28936246e547234f727a923d2542d92f766fb2e0 (patch) | |
| tree | 34393ef0a7afcc95a0ef4cb45ce1b0560f9edd84 /src/declarative/util/qfxview.h | |
| parent | d107f39df40990d4cbd1fc5983c5de7ae46bb374 (diff) | |
| parent | 7e95bf13d72b28c87dab4b346fd96de6e8a4c046 (diff) | |
| download | Qt-28936246e547234f727a923d2542d92f766fb2e0.zip Qt-28936246e547234f727a923d2542d92f766fb2e0.tar.gz Qt-28936246e547234f727a923d2542d92f766fb2e0.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'src/declarative/util/qfxview.h')
| -rw-r--r-- | src/declarative/util/qfxview.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/declarative/util/qfxview.h b/src/declarative/util/qfxview.h index 3c4be20..c658f07 100644 --- a/src/declarative/util/qfxview.h +++ b/src/declarative/util/qfxview.h @@ -95,6 +95,7 @@ protected: virtual void resizeEvent(QResizeEvent *); void focusInEvent(QFocusEvent *); void focusOutEvent(QFocusEvent *); + void timerEvent(QTimerEvent*); private: friend class QFxViewPrivate; |