From 0eb3d743863e7a32cd926c1424686dbde6db941b Mon Sep 17 00:00:00 2001 From: Jorgen Lind Date: Tue, 4 Sep 2012 15:03:53 +0200 Subject: 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 --- src/widgets/widgets/qwidgettextcontrol.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/widgets') 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() -- cgit v1.2.3