diff options
| author | Jan-Arve Sæther <jan-arve.saether@nokia.com> | 2011-03-16 08:44:44 (GMT) |
|---|---|---|
| committer | Jan-Arve Sæther <jan-arve.saether@nokia.com> | 2011-03-16 08:44:44 (GMT) |
| commit | 245e0454a82a0fba7a1605320acf6b231c8d4205 (patch) | |
| tree | 8e1ccd930b22a82c45e77b452bb5f0a230c499d1 /src/gui/text/qtextcontrol_p_p.h | |
| parent | 517290f73be74d1cf08fbd603870d3dacc379ff3 (diff) | |
| parent | b18bd68dd05f000c65e33a975bca6bf24dabb8d3 (diff) | |
| download | Qt-245e0454a82a0fba7a1605320acf6b231c8d4205.zip Qt-245e0454a82a0fba7a1605320acf6b231c8d4205.tar.gz Qt-245e0454a82a0fba7a1605320acf6b231c8d4205.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-water-team into 4.7
Diffstat (limited to 'src/gui/text/qtextcontrol_p_p.h')
| -rw-r--r-- | src/gui/text/qtextcontrol_p_p.h | 20 |
1 files changed, 17 insertions, 3 deletions
diff --git a/src/gui/text/qtextcontrol_p_p.h b/src/gui/text/qtextcontrol_p_p.h index ecd13ea..94670e2 100644 --- a/src/gui/text/qtextcontrol_p_p.h +++ b/src/gui/text/qtextcontrol_p_p.h @@ -135,9 +135,23 @@ public: Qt::KeyboardModifiers modifiers, Qt::MouseButtons buttons, const QPoint &globalPos); - void mouseMoveEvent(Qt::MouseButtons buttons, const QPointF &pos); - void mouseReleaseEvent(Qt::MouseButton button, const QPointF &pos); - void mouseDoubleClickEvent(QEvent *e, Qt::MouseButton button, const QPointF &pos); + void mouseMoveEvent(QEvent *e, Qt::MouseButton button, const QPointF &pos, + Qt::KeyboardModifiers modifiers, + Qt::MouseButtons buttons, + const QPoint &globalPos); + void mouseReleaseEvent(QEvent *e, Qt::MouseButton button, const QPointF &pos, + Qt::KeyboardModifiers modifiers, + Qt::MouseButtons buttons, + const QPoint &globalPos); + void mouseDoubleClickEvent(QEvent *e, Qt::MouseButton button, const QPointF &pos, + Qt::KeyboardModifiers modifiers, + Qt::MouseButtons buttons, + const QPoint &globalPos); + bool sendMouseEventToInputContext(QEvent *e, QEvent::Type eventType, Qt::MouseButton button, + const QPointF &pos, + Qt::KeyboardModifiers modifiers, + Qt::MouseButtons buttons, + const QPoint &globalPos); void contextMenuEvent(const QPoint &screenPos, const QPointF &docPos, QWidget *contextWidget); void focusEvent(QFocusEvent *e); #ifdef QT_KEYPAD_NAVIGATION |