summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorEskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>2011-09-15 10:51:50 +0200
committerQt by Nokia <qt-info@nokia.com>2011-09-15 16:12:40 +0200
commit28b455d2386a30d5a00352992e943047573dc478 (patch)
tree1c697c99ca3cad7f17147c958fd76a75427aa7d6 /src
parentd75d22d1b29f2d1ec826aebb0e8c0646760dbb10 (diff)
Properly register preedit text in QLineControl
Removes the QT_NO_IM macro which was a temporary measure during refactoring work. This macro disabled the setPreeditArea() call and caused only the formats of the preedit text to be registered, not the actual string. Task-number: QTBUG-21261 Change-Id: I76cdf116043520fa2185ddcd34739da031c0fcdc Reviewed-on: http://codereview.qt-project.org/4958 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Diffstat (limited to 'src')
-rw-r--r--src/gui/text/qlinecontrol.cpp1
1 files changed, 0 insertions, 1 deletions
diff --git a/src/gui/text/qlinecontrol.cpp b/src/gui/text/qlinecontrol.cpp
index eb6f22b726..0113f4b176 100644
--- a/src/gui/text/qlinecontrol.cpp
+++ b/src/gui/text/qlinecontrol.cpp
@@ -41,7 +41,6 @@
// ###
#define QT_NO_ACCESSIBILITY
-#define QT_NO_IM
#include "qlinecontrol_p.h"