summaryrefslogtreecommitdiffstats
path: root/src/corelib
diff options
context:
space:
mode:
authorLars Knoll <lars.knoll@nokia.com>2011-09-08 10:57:54 +0200
committerLars Knoll <lars.knoll@nokia.com>2011-09-08 11:28:38 +0200
commit6f65a55fa9a5bf8a547dff2893d49ab405a16af0 (patch)
tree971efee66ddcb83afd0f664a6dfa4747436619de /src/corelib
parent1b1831500142c995137f5e4b1bc03d21aa08e1e1 (diff)
Rename ImMicroFocus to ImCursorRectangle
Also set ImhMultiLine on QTextEdit Change-Id: I04a5a1d69c2048ea94c24210e2b8374f334be1b6 Reviewed-on: http://codereview.qt-project.org/4414 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Diffstat (limited to 'src/corelib')
-rw-r--r--src/corelib/global/qnamespace.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/corelib/global/qnamespace.h b/src/corelib/global/qnamespace.h
index 740579b11d..a4b9cf1777 100644
--- a/src/corelib/global/qnamespace.h
+++ b/src/corelib/global/qnamespace.h
@@ -1235,7 +1235,8 @@ public:
enum InputMethodQuery {
ImEnabled = 0x1,
- ImMicroFocus = 0x2,
+ ImCursorRectangle = 0x2,
+ ImMicroFocus = 0x2, // deprecated
ImFont = 0x4,
ImCursorPosition = 0x8,
ImSurroundingText = 0x10,