diff options
| author | Thierry Bastian <thierry.bastian@nokia.com> | 2010-12-05 00:00:13 (GMT) |
|---|---|---|
| committer | Thierry Bastian <thierry.bastian@nokia.com> | 2010-12-05 00:00:13 (GMT) |
| commit | 3905cdb7424997f08774401e06d67d295fecb2b5 (patch) | |
| tree | 0933c077f4c77aed8cb3734310b85b10dd29837c /src/corelib | |
| parent | aa5a3a4c13223dabe2bfc5d7f288bb824524f5a3 (diff) | |
| parent | 4a00c77f1e7c93519a8bb7cea09849d911b51607 (diff) | |
| download | Qt-3905cdb7424997f08774401e06d67d295fecb2b5.zip Qt-3905cdb7424997f08774401e06d67d295fecb2b5.tar.gz Qt-3905cdb7424997f08774401e06d67d295fecb2b5.tar.bz2 | |
Merge branch 'master-upstream' into master-water
Diffstat (limited to 'src/corelib')
| -rw-r--r-- | src/corelib/kernel/qcoreevent.cpp | 2 | ||||
| -rw-r--r-- | src/corelib/kernel/qcoreevent.h | 3 |
2 files changed, 5 insertions, 0 deletions
diff --git a/src/corelib/kernel/qcoreevent.cpp b/src/corelib/kernel/qcoreevent.cpp index d23ea4c..4da5fa9 100644 --- a/src/corelib/kernel/qcoreevent.cpp +++ b/src/corelib/kernel/qcoreevent.cpp @@ -231,6 +231,8 @@ QT_BEGIN_NAMESPACE \value WinIdChange The window system identifer for this native widget has changed \value Gesture A gesture was triggered (QGestureEvent) \value GestureOverride A gesture override was triggered (QGestureEvent) + \value ScrollPrepare The object needs to fill in its geometry information (QScrollPrepareEvent) + \value Scroll The object needs to scroll to the supplied position (QScrollEvent) User events should have values between \c User and \c{MaxUser}: diff --git a/src/corelib/kernel/qcoreevent.h b/src/corelib/kernel/qcoreevent.h index 4c91aaf..08b751c 100644 --- a/src/corelib/kernel/qcoreevent.h +++ b/src/corelib/kernel/qcoreevent.h @@ -288,6 +288,9 @@ public: Gesture = 198, GestureOverride = 202, #endif + ScrollPrepare = 204, + Scroll = 205, + // 512 reserved for Qt Jambi's MetaCall event // 513 reserved for Qt Jambi's DeleteOnMainThread event |