diff options
| author | Jorgen Lind <jorgen.lind@gmail.com> | 2012-09-04 15:03:53 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-09-05 06:36:13 +0200 |
| commit | 0eb3d743863e7a32cd926c1424686dbde6db941b (patch) | |
| tree | a5a78df1f846f6d8f391ed44fef3d508cfc5143c /src/widgets | |
| parent | d7cfd02082cff3be6622b95fd71ddea77c3401ee (diff) | |
Move assignment of mousePressed variable in QWidgetTextControl
Or else we never hit the path where middle button click pasts selection
on X11. This is also how it worked in Qt 4.
Change-Id: Ia090c465db0e5e8cb249f5d752e0bb86951e2eb0
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Diffstat (limited to 'src/widgets')
| -rw-r--r-- | src/widgets/widgets/qwidgettextcontrol.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/widgets/widgets/qwidgettextcontrol.cpp b/src/widgets/widgets/qwidgettextcontrol.cpp index d1ac8d3734..48f20616a2 100644 --- a/src/widgets/widgets/qwidgettextcontrol.cpp +++ b/src/widgets/widgets/qwidgettextcontrol.cpp @@ -1527,7 +1527,6 @@ void QWidgetTextControlPrivate::mousePressEvent(QEvent *e, Qt::MouseButton butto { Q_Q(QWidgetTextControl); - mousePressed = (interactionFlags & Qt::TextSelectableByMouse); mousePressPos = pos.toPoint(); #ifndef QT_NO_DRAGANDDROP @@ -1558,6 +1557,8 @@ void QWidgetTextControlPrivate::mousePressEvent(QEvent *e, Qt::MouseButton butto const QTextCursor oldSelection = cursor; const int oldCursorPos = cursor.position(); + mousePressed = (interactionFlags & Qt::TextSelectableByMouse); + commitPreedit(); if (trippleClickTimer.isActive() |