summaryrefslogtreecommitdiffstats
path: root/src/corelib/global
diff options
context:
space:
mode:
authorJoona Petrell <joona.t.petrell@nokia.com>2011-11-18 14:10:51 +0200
committerQt by Nokia <qt-info@nokia.com>2011-11-21 09:58:23 +0100
commit249c4fc8e964876081fa3dab097573aab891f8ef (patch)
treeb1e6414e8831abb8b0aaabd6f17305f375c48410 /src/corelib/global
parente8b4c49efddb87f4195c74668b5026119eccea56 (diff)
Add Q_ENUMS and Q_FLAGS to enumeration InputMethodQuery and flag InputMethodQueries
Change-Id: If6f535a28af06e7e1790d8876f99dcb9ab8a3b41 Reviewed-by: Pekka Vuorela <pekka.ta.vuorela@nokia.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Diffstat (limited to 'src/corelib/global')
-rw-r--r--src/corelib/global/qnamespace.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/corelib/global/qnamespace.h b/src/corelib/global/qnamespace.h
index ccc6bbd6b2..2e266b52f3 100644
--- a/src/corelib/global/qnamespace.h
+++ b/src/corelib/global/qnamespace.h
@@ -86,9 +86,10 @@ Qt {
Q_FLAGS(MatchFlags)
Q_FLAGS(KeyboardModifiers MouseButtons)
Q_ENUMS(WindowType WindowState WindowModality WidgetAttribute ApplicationAttribute)
+ Q_FLAGS(WindowFlags WindowStates)
+ Q_ENUMS(InputMethodHint InputMethodQuery)
+ Q_FLAGS(InputMethodHints InputMethodQueries)
Q_ENUMS(ScreenOrientation)
- Q_ENUMS(InputMethodHint)
- Q_FLAGS(WindowFlags WindowStates InputMethodHints)
Q_FLAGS(ScreenOrientations)
Q_ENUMS(ConnectionType)
#ifndef QT_NO_GESTURES