diff options
| author | Gunnar Sletta <gunnar@trolltech.com> | 2009-11-13 08:07:29 +0100 |
|---|---|---|
| committer | Gunnar Sletta <gunnar@trolltech.com> | 2009-11-13 08:07:29 +0100 |
| commit | 3794e55c2c8427dd8bd4f86af5e894cc80267881 (patch) | |
| tree | 9067656d5e021a585a976fb84f73b94e161cae19 /src/gui/text/qtextcontrol_p_p.h | |
| parent | 7be079e1b1f13b58f5d69f86e5854edd25065532 (diff) | |
| parent | 99b19431e6846a36a65f23d21a95140a081d1f1a (diff) | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6
Conflicts:
dist/changes-4.6.0
Diffstat (limited to 'src/gui/text/qtextcontrol_p_p.h')
| -rw-r--r-- | src/gui/text/qtextcontrol_p_p.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/text/qtextcontrol_p_p.h b/src/gui/text/qtextcontrol_p_p.h index af3b521fba..c2305122b2 100644 --- a/src/gui/text/qtextcontrol_p_p.h +++ b/src/gui/text/qtextcontrol_p_p.h @@ -131,10 +131,10 @@ public: QString anchorForCursor(const QTextCursor &anchor) const; void keyPressEvent(QKeyEvent *e); - void mousePressEvent(Qt::MouseButton button, const QPointF &pos, + void mousePressEvent(QEvent *e, Qt::MouseButton button, const QPointF &pos, Qt::KeyboardModifiers modifiers, Qt::MouseButtons buttons, - const QPoint &globalPos = QPoint()); + 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); |