diff options
| author | Michael Brasser <michael.brasser@nokia.com> | 2009-08-18 00:23:21 (GMT) |
|---|---|---|
| committer | Michael Brasser <michael.brasser@nokia.com> | 2009-08-18 00:23:21 (GMT) |
| commit | 39a2e72700aa481fefc7df7fa64d8dc8c1670d2e (patch) | |
| tree | bd3abb779a0e934c9d1905532d1019613703cfd5 /src/declarative/fx/qfxitem.cpp | |
| parent | c9f4ad424949085209acda6cff07babbe8d29001 (diff) | |
| parent | 41335c52ef2844589030cddb4773c68cf38331af (diff) | |
| download | Qt-39a2e72700aa481fefc7df7fa64d8dc8c1670d2e.zip Qt-39a2e72700aa481fefc7df7fa64d8dc8c1670d2e.tar.gz Qt-39a2e72700aa481fefc7df7fa64d8dc8c1670d2e.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 | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/declarative/fx/qfxitem.cpp b/src/declarative/fx/qfxitem.cpp index f5f502c..572fcc7 100644 --- a/src/declarative/fx/qfxitem.cpp +++ b/src/declarative/fx/qfxitem.cpp @@ -658,6 +658,7 @@ signals: void downPressed(QFxKeyEvent *event); void asteriskPressed(QFxKeyEvent *event); + void numberSignPressed(QFxKeyEvent *event); void escapePressed(QFxKeyEvent *event); void returnPressed(QFxKeyEvent *event); void enterPressed(QFxKeyEvent *event); @@ -713,6 +714,7 @@ const QFxKeysAttached::SigMap QFxKeysAttached::sigMap[] = { { Qt::Key_Up, "upPressed" }, { Qt::Key_Down, "downPressed" }, { Qt::Key_Asterisk, "asteriskPressed" }, + { Qt::Key_NumberSign, "numberSignPressed" }, { Qt::Key_Escape, "escapePressed" }, { Qt::Key_Return, "returnPressed" }, { Qt::Key_Enter, "enterPressed" }, |