diff options
| author | Martin Jones <martin.jones@nokia.com> | 2009-10-07 07:06:18 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2009-10-07 07:06:18 (GMT) |
| commit | 14786157ac329f97812ad337f506b129be0796f4 (patch) | |
| tree | fa49d749084068e9360b40ccab2e71c9259739dc | |
| parent | 83ebad552bfdb9ac057fbf49316ed5becf70426d (diff) | |
| parent | 605f47d61c44e1219811b2d68d3fcb51ab284015 (diff) | |
| download | Qt-14786157ac329f97812ad337f506b129be0796f4.zip Qt-14786157ac329f97812ad337f506b129be0796f4.tar.gz Qt-14786157ac329f97812ad337f506b129be0796f4.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of 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: |
