diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-05-16 14:59:56 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-05-16 14:59:56 (GMT) |
| commit | 219175903f9722bee12271321614cdaeb88eb914 (patch) | |
| tree | 8451797482725dc11d351667e0945de2e57644f2 /src/corelib | |
| parent | 7e4a9187bb11b794e45d95d2e9fae026d6b0d07d (diff) | |
| parent | 4f7af4c544c3b793ba8cccb28e5c856f3d754e4a (diff) | |
| download | Qt-219175903f9722bee12271321614cdaeb88eb914.zip Qt-219175903f9722bee12271321614cdaeb88eb914.tar.gz Qt-219175903f9722bee12271321614cdaeb88eb914.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Revert all QScroller and QFlickGesture related code.
Fix regression that caused waitForXXX(-1) to fail.
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, 0 insertions, 5 deletions
diff --git a/src/corelib/kernel/qcoreevent.cpp b/src/corelib/kernel/qcoreevent.cpp index fbb08fa..a8cf5f1 100644 --- a/src/corelib/kernel/qcoreevent.cpp +++ b/src/corelib/kernel/qcoreevent.cpp @@ -231,8 +231,6 @@ 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 c9d311a..c151c5e 100644 --- a/src/corelib/kernel/qcoreevent.h +++ b/src/corelib/kernel/qcoreevent.h @@ -288,9 +288,6 @@ 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 |