diff options
| author | Michael Brasser <michael.brasser@nokia.com> | 2009-08-25 22:57:29 (GMT) |
|---|---|---|
| committer | Michael Brasser <michael.brasser@nokia.com> | 2009-08-25 22:57:29 (GMT) |
| commit | 314c6ec54e4cb4e2ec936ada7e0a112a60b87832 (patch) | |
| tree | a5444e7cae8d40eb549b70dd4473057f6b3cda09 /src/declarative/fx/qfxitem_p.h | |
| parent | 8e580cebef7128666017ba39d41aa620a1d2eddf (diff) | |
| parent | 0094735947164aef8f8e6539c535199b29ed6f4e (diff) | |
| download | Qt-314c6ec54e4cb4e2ec936ada7e0a112a60b87832.zip Qt-314c6ec54e4cb4e2ec936ada7e0a112a60b87832.tar.gz Qt-314c6ec54e4cb4e2ec936ada7e0a112a60b87832.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_p.h')
| -rw-r--r-- | src/declarative/fx/qfxitem_p.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/declarative/fx/qfxitem_p.h b/src/declarative/fx/qfxitem_p.h index 1d4bef3..d30e324 100644 --- a/src/declarative/fx/qfxitem_p.h +++ b/src/declarative/fx/qfxitem_p.h @@ -67,7 +67,7 @@ QT_BEGIN_NAMESPACE class QNetworkReply; -class QFxKeysAttached; +class QFxItemKeyFilter; //### merge into private? class QFxContents : public QObject @@ -209,7 +209,7 @@ public: bool _keepMouse:1; bool smooth:1; - QFxKeysAttached *keyHandler; + QFxItemKeyFilter *keyHandler; qreal width; qreal height; |