summaryrefslogtreecommitdiffstats
path: root/src/corelib/global/qnamespace.h
diff options
context:
space:
mode:
authorAlessandro Portale <aportale@trolltech.com>2009-06-03 12:32:12 (GMT)
committerAlessandro Portale <aportale@trolltech.com>2009-06-03 12:32:12 (GMT)
commit3524dcecdd7d3fef48932f17814bf4a2ecd2cda7 (patch)
tree294ba02513110e42377b5a140fc6cf03cd31c857 /src/corelib/global/qnamespace.h
parent9db0d28080b4b08ef484e2fb767e20a2754f537d (diff)
parent3d05a836cb0bc62e6dc31d297bada07ec60adc34 (diff)
downloadQt-3524dcecdd7d3fef48932f17814bf4a2ecd2cda7.zip
Qt-3524dcecdd7d3fef48932f17814bf4a2ecd2cda7.tar.gz
Qt-3524dcecdd7d3fef48932f17814bf4a2ecd2cda7.tar.bz2
Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-public
Diffstat (limited to 'src/corelib/global/qnamespace.h')
-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 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 {