summaryrefslogtreecommitdiffstats
path: root/src/corelib
diff options
context:
space:
mode:
authorDenis Dzyubenko <denis.dzyubenko@nokia.com>2009-02-26 14:39:00 (GMT)
committerDenis Dzyubenko <denis.dzyubenko@nokia.com>2009-05-11 13:38:54 (GMT)
commita3d8cfb1ee89e0600add864db53d67552820b95a (patch)
treed396d751de49d26c052b8752c94d5247503083e2 /src/corelib
parent7396eea79c9464d0c246106834cbce02320e7989 (diff)
downloadQt-a3d8cfb1ee89e0600add864db53d67552820b95a.zip
Qt-a3d8cfb1ee89e0600add864db53d67552820b95a.tar.gz
Qt-a3d8cfb1ee89e0600add864db53d67552820b95a.tar.bz2
Merge of the maemo-gestures branch onto qt/4.5.0
This is a squashed merge of all of the changes in the maemo-gestures branch on-top of the qt/4.5.0 branch.
Diffstat (limited to 'src/corelib')
-rw-r--r--src/corelib/global/qnamespace.h15
-rw-r--r--src/corelib/kernel/qcoreevent.h2
2 files changed, 17 insertions, 0 deletions
diff --git a/src/corelib/global/qnamespace.h b/src/corelib/global/qnamespace.h
index 1635f8a..5747c3c 100644
--- a/src/corelib/global/qnamespace.h
+++ b/src/corelib/global/qnamespace.h
@@ -1550,6 +1550,21 @@ public:
TouchPointStationary,
TouchPointReleased
};
+
+ typedef QString GestureType;
+ static const char UnknownGesture[] = "???";
+ static const char Tap[] = "Tap";
+ static const char DoubleTap[] = "DoubleTap";
+ static const char LongTap[] = "LongTap";
+ static const char Pan[] = "Pan";
+ static const char Pinch[] = "Pinch";
+
+ enum GestureState
+ {
+ GestureStarted = 0,
+ GestureFinished = 1
+ };
+
}
#ifdef Q_MOC_RUN
;
diff --git a/src/corelib/kernel/qcoreevent.h b/src/corelib/kernel/qcoreevent.h
index 42a75f8..c9f9f24 100644
--- a/src/corelib/kernel/qcoreevent.h
+++ b/src/corelib/kernel/qcoreevent.h
@@ -273,6 +273,8 @@ public:
GraphicsSceneTouchUpdate = 197,
GraphicsSceneTouchEnd = 198,
+ Gesture = 191,
+
// 512 reserved for Qt Jambi's MetaCall event
// 513 reserved for Qt Jambi's DeleteOnMainThread event