summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDenis Dzyubenko <denis.dzyubenko@nokia.com>2009-05-11 15:24:02 (GMT)
committerDenis Dzyubenko <denis.dzyubenko@nokia.com>2009-05-11 15:24:02 (GMT)
commit21e699d7abff8b75157ee1305ac1dee35c748e98 (patch)
treebef635f512ddd071e6d468e6623e13225aa90e72
parent0466a193fd1b8bd7c6f165c3032c47a08a881529 (diff)
downloadQt-21e699d7abff8b75157ee1305ac1dee35c748e98.zip
Qt-21e699d7abff8b75157ee1305ac1dee35c748e98.tar.gz
Qt-21e699d7abff8b75157ee1305ac1dee35c748e98.tar.bz2
Fixed gesture event id after merging branches
-rw-r--r--src/corelib/kernel/qcoreevent.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/corelib/kernel/qcoreevent.h b/src/corelib/kernel/qcoreevent.h
index cb24723..76cdf7c 100644
--- a/src/corelib/kernel/qcoreevent.h
+++ b/src/corelib/kernel/qcoreevent.h
@@ -273,8 +273,8 @@ public:
GraphicsSceneTouchUpdate = 197,
GraphicsSceneTouchEnd = 198,
- Gesture = 191,
- GraphicsSceneGesture = 192,
+ Gesture = 199,
+ GraphicsSceneGesture = 200,
// 512 reserved for Qt Jambi's MetaCall event
// 513 reserved for Qt Jambi's DeleteOnMainThread event