Properly register preedit text in QLineControl
authorEskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
Thu, 15 Sep 2011 08:51:50 +0000 (10:51 +0200)
committerQt by Nokia <qt-info@nokia.com>
Thu, 15 Sep 2011 14:12:40 +0000 (16:12 +0200)
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>
src/gui/text/qlinecontrol.cpp

index eb6f22b..0113f4b 100644 (file)
@@ -41,7 +41,6 @@
 
 // ###
 #define QT_NO_ACCESSIBILITY
-#define QT_NO_IM
 
 #include "qlinecontrol_p.h"