diff options
| author | Yann Bodson <yann.bodson@nokia.com> | 2009-10-07 07:09:54 (GMT) |
|---|---|---|
| committer | Yann Bodson <yann.bodson@nokia.com> | 2009-10-07 07:09:54 (GMT) |
| commit | 84bb66942c1409513f01818a27ca184b26a8df02 (patch) | |
| tree | 8538898570b89cc08f2969cabb70c209973bcd2b | |
| parent | 28e0f484cfb2b677661f0cb1a90a7b88d8f46f03 (diff) | |
| parent | 605f47d61c44e1219811b2d68d3fcb51ab284015 (diff) | |
| download | Qt-84bb66942c1409513f01818a27ca184b26a8df02.zip Qt-84bb66942c1409513f01818a27ca184b26a8df02.tar.gz Qt-84bb66942c1409513f01818a27ca184b26a8df02.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| -rw-r--r-- | doc/src/declarative/pics/declarative-adv-tutorial4.gif | bin | 58337629 -> 1687445 bytes | |||
| -rw-r--r-- | src/declarative/fx/qfxtextinput.cpp | 1 |
2 files changed, 1 insertions, 0 deletions
diff --git a/doc/src/declarative/pics/declarative-adv-tutorial4.gif b/doc/src/declarative/pics/declarative-adv-tutorial4.gif Binary files differindex a67666d..827458d 100644 --- a/doc/src/declarative/pics/declarative-adv-tutorial4.gif +++ b/doc/src/declarative/pics/declarative-adv-tutorial4.gif diff --git a/src/declarative/fx/qfxtextinput.cpp b/src/declarative/fx/qfxtextinput.cpp index b7b155a..05d2260 100644 --- a/src/declarative/fx/qfxtextinput.cpp +++ b/src/declarative/fx/qfxtextinput.cpp @@ -594,6 +594,7 @@ bool QFxTextInput::event(QEvent* ev) bool handled = false; switch(ev->type()){ case QEvent::KeyPress: + case QEvent::KeyRelease://###Should the control be doing anything with release? case QEvent::GraphicsSceneMousePress: break; default: |
