diff options
| author | Kent Hansen <kent.hansen@nokia.com> | 2012-03-23 14:31:28 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-03-23 14:31:28 +0100 |
| commit | 425b38ef95f6f4478ffbd4ada0d3046fae2c95e7 (patch) | |
| tree | 0347dd701ace8ab022cf6c86edbb61be9795a668 /src/widgets/widgets/qwidgettextcontrol.cpp | |
| parent | 2f2b78321427daa8c7f0702140c297d22b0bf3c8 (diff) | |
| parent | 3b512ae142017f105f297467f74dc28d3cb9030a (diff) | |
Merge "Merge master into api_changes" into refs/staging/api_changes
Diffstat (limited to 'src/widgets/widgets/qwidgettextcontrol.cpp')
| -rw-r--r-- | src/widgets/widgets/qwidgettextcontrol.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/widgets/widgets/qwidgettextcontrol.cpp b/src/widgets/widgets/qwidgettextcontrol.cpp index 9eeffc1231..86dfb30389 100644 --- a/src/widgets/widgets/qwidgettextcontrol.cpp +++ b/src/widgets/widgets/qwidgettextcontrol.cpp @@ -1829,7 +1829,7 @@ bool QWidgetTextControlPrivate::sendMouseEventToInputContext( #if !defined(QT_NO_IM) Q_Q(QWidgetTextControl); - if (contextWidget && isPreediting()) { + if (isPreediting()) { QTextLayout *layout = cursor.block().layout(); int cursorPos = q->hitTest(pos, Qt::FuzzyHit) - cursor.position(); @@ -1837,7 +1837,7 @@ bool QWidgetTextControlPrivate::sendMouseEventToInputContext( cursorPos = -1; if (cursorPos >= 0) { - if (e->type() == QEvent::MouseButtonRelease) + if (eventType == QEvent::MouseButtonRelease) qApp->inputMethod()->invokeAction(QInputMethod::Click, cursorPos); e->setAccepted(true); |