diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-02-10 07:57:23 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-02-10 07:57:23 (GMT) |
| commit | d446a0ec464556ede91225b14e75f2f8f5a748d5 (patch) | |
| tree | 75b018d9dedfd47ee112bb54993fbdaa4330abc2 /src/declarative/graphicsitems/qdeclarativetextinput_p.h | |
| parent | 50bb35a5ca48816f7563d1055071b4caa7791056 (diff) | |
| parent | db8462b107ad3dbf13c1eed43588fb1d9420f4ad (diff) | |
| download | Qt-d446a0ec464556ede91225b14e75f2f8f5a748d5.zip Qt-d446a0ec464556ede91225b14e75f2f8f5a748d5.tar.gz Qt-d446a0ec464556ede91225b14e75f2f8f5a748d5.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
PathView items were not correctly updated when rootIndex changed.
Allow text to selected in a TextEdit or TextInput inside a Flickable.
Diffstat (limited to 'src/declarative/graphicsitems/qdeclarativetextinput_p.h')
| -rw-r--r-- | src/declarative/graphicsitems/qdeclarativetextinput_p.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/declarative/graphicsitems/qdeclarativetextinput_p.h b/src/declarative/graphicsitems/qdeclarativetextinput_p.h index 63d0e53..e1e66a9 100644 --- a/src/declarative/graphicsitems/qdeclarativetextinput_p.h +++ b/src/declarative/graphicsitems/qdeclarativetextinput_p.h @@ -240,6 +240,7 @@ protected: void mouseMoveEvent(QGraphicsSceneMouseEvent *event); void mouseReleaseEvent(QGraphicsSceneMouseEvent *event); void mouseDoubleClickEvent(QGraphicsSceneMouseEvent *event); + bool sceneEvent(QEvent *event); void keyPressEvent(QKeyEvent* ev); void inputMethodEvent(QInputMethodEvent *); bool event(QEvent *e); |