diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2014-10-28 18:21:29 +0100 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2014-10-28 18:21:45 +0100 |
| commit | 8613b64f535b0ce05adf6f4708ba0826f22a7eb4 (patch) | |
| tree | 101d18856ef81169df0da8a0e7afb846e5579a62 /src/widgets/widgets/qwidgetlinecontrol_p.h | |
| parent | d6c1a9cb267cc5ffec2e55bc9990ced43c19b73a (diff) | |
| parent | a3cb057c3d5c9ed2c12fb7542065c3d667be38b7 (diff) | |
Merge remote-tracking branch 'origin/5.3' into 5.4
Change-Id: I224e44a9df314b9a99d33148b6cf400fcbc9de8e
Diffstat (limited to 'src/widgets/widgets/qwidgetlinecontrol_p.h')
| -rw-r--r-- | src/widgets/widgets/qwidgetlinecontrol_p.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/widgets/widgets/qwidgetlinecontrol_p.h b/src/widgets/widgets/qwidgetlinecontrol_p.h index 328faf7926..f21d88177c 100644 --- a/src/widgets/widgets/qwidgetlinecontrol_p.h +++ b/src/widgets/widgets/qwidgetlinecontrol_p.h @@ -228,8 +228,10 @@ public: } void setText(const QString &txt) { +#ifndef QT_NO_IM if (composeMode()) qApp->inputMethod()->reset(); +#endif internalSetText(txt, -1, false); } void commitPreedit(); |