summaryrefslogtreecommitdiffstats
path: root/src/corelib/global/qnamespace.h
diff options
context:
space:
mode:
authorGunnar Sletta <gunnar@trolltech.com>2009-10-26 07:06:59 (GMT)
committerGunnar Sletta <gunnar@trolltech.com>2009-10-26 07:06:59 (GMT)
commit9a1ee410d24321e7eedaea6bb4f1b21fcc6fb427 (patch)
tree37ae0ceb0eb9d4f74683b02bf3187cfd7f694c6c /src/corelib/global/qnamespace.h
parent2c0921b667ec74df6ad3d749b30bb9b7c5843343 (diff)
parent35c8033ff51ab6d0567e786b790b8cc49852803b (diff)
downloadQt-9a1ee410d24321e7eedaea6bb4f1b21fcc6fb427.zip
Qt-9a1ee410d24321e7eedaea6bb4f1b21fcc6fb427.tar.gz
Qt-9a1ee410d24321e7eedaea6bb4f1b21fcc6fb427.tar.bz2
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6
Diffstat (limited to 'src/corelib/global/qnamespace.h')
-rw-r--r--src/corelib/global/qnamespace.h5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/corelib/global/qnamespace.h b/src/corelib/global/qnamespace.h
index f28f94e..2b62c6b 100644
--- a/src/corelib/global/qnamespace.h
+++ b/src/corelib/global/qnamespace.h
@@ -1631,7 +1631,10 @@ public:
enum GestureContext
{
WidgetGesture = 0,
- WidgetWithChildrenGesture = 3
+ WidgetWithChildrenGesture = 3,
+
+ ItemGesture = WidgetGesture,
+ ItemWithChildrenGesture = WidgetWithChildrenGesture
};
enum NavigationMode