diff options
author | axis <qt-info@nokia.com> | 2009-06-03 11:17:16 (GMT) |
---|---|---|
committer | axis <qt-info@nokia.com> | 2009-06-03 11:17:16 (GMT) |
commit | 3d05a836cb0bc62e6dc31d297bada07ec60adc34 (patch) | |
tree | 21f3dc65344c2e094708615cbd430166f021ad65 /src/corelib/global | |
parent | 612ebdbf04161b4768fc7a2800fbf0c7b73dd424 (diff) | |
parent | 3592724b1f7e635904c31ba09a61d6b7259c93e5 (diff) | |
download | Qt-3d05a836cb0bc62e6dc31d297bada07ec60adc34.zip Qt-3d05a836cb0bc62e6dc31d297bada07ec60adc34.tar.gz Qt-3d05a836cb0bc62e6dc31d297bada07ec60adc34.tar.bz2 |
Merge branch 'imSelections'
Diffstat (limited to 'src/corelib/global')
-rw-r--r-- | src/corelib/global/qnamespace.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/corelib/global/qnamespace.h b/src/corelib/global/qnamespace.h index 75524a0..43740ed 100644 --- a/src/corelib/global/qnamespace.h +++ b/src/corelib/global/qnamespace.h @@ -1395,7 +1395,8 @@ public: ImCursorPosition, ImSurroundingText, ImCurrentSelection, - ImMaximumTextLength + ImMaximumTextLength, + ImAnchorPosition }; enum InputMethodHint { |