diff options
| author | Steffen Imhof <steffen.imhof@basyskom.com> | 2014-06-17 09:51:07 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2014-10-28 14:04:27 +0100 |
| commit | 7f8f476244e551b224b56c7f2bff128bc4d873b8 (patch) | |
| tree | efe8e9002ccb90058f295986e2016e383dab2371 /src/widgets/widgets/qwidgetlinecontrol_p.h | |
| parent | 3dc4b9ac86968c6a921c546a44c1929ad6684473 (diff) | |
Compile fix for QT_NO_IM in QtWidgets
Added some #ifdef guards around usages of composeMode().
Change-Id: If2f2d3cae21b270933b38ea67dcc885f5871785f
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
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 1cee67bfd2..5ce1d0ed56 100644 --- a/src/widgets/widgets/qwidgetlinecontrol_p.h +++ b/src/widgets/widgets/qwidgetlinecontrol_p.h @@ -221,8 +221,10 @@ public: } void setText(const QString &txt) { +#ifndef QT_NO_IM if (composeMode()) qApp->inputMethod()->reset(); +#endif internalSetText(txt, -1, false); } void commitPreedit(); |