diff options
| author | Rohan McGovern <rohan.mcgovern@nokia.com> | 2011-05-17 23:05:24 (GMT) |
|---|---|---|
| committer | Rohan McGovern <rohan.mcgovern@nokia.com> | 2011-05-17 23:05:24 (GMT) |
| commit | 08a5b8d504e86a80488a2a13525e700b6f8b3311 (patch) | |
| tree | 3e6b31daecfe217b355fa973f2f122da8468c0ac /src/corelib | |
| parent | 3773fcb78db02a2577c89f755c07c2c7dbf0de74 (diff) | |
| parent | cb2980a09aefcc207eacb500d5a3c74f064859dd (diff) | |
| download | Qt-08a5b8d504e86a80488a2a13525e700b6f8b3311.zip Qt-08a5b8d504e86a80488a2a13525e700b6f8b3311.tar.gz Qt-08a5b8d504e86a80488a2a13525e700b6f8b3311.tar.bz2 | |
Merge remote branch 'origin/4.8' into 4.8-from-4.7
Diffstat (limited to 'src/corelib')
| -rw-r--r-- | src/corelib/global/qnamespace.h | 6 | ||||
| -rw-r--r-- | src/corelib/kernel/qcoreevent.cpp | 2 | ||||
| -rw-r--r-- | src/corelib/kernel/qcoreevent.h | 3 |
3 files changed, 6 insertions, 5 deletions
diff --git a/src/corelib/global/qnamespace.h b/src/corelib/global/qnamespace.h index 75ce68a..f086513 100644 --- a/src/corelib/global/qnamespace.h +++ b/src/corelib/global/qnamespace.h @@ -94,6 +94,7 @@ Qt { Q_ENUMS(GestureState) Q_ENUMS(GestureType) #endif + Q_ENUMS(CursorMoveStyle) #endif // (defined(Q_MOC_RUN) || defined(QT_JAMBI_RUN)) #if defined(Q_MOC_RUN) @@ -1784,6 +1785,11 @@ public: NavigationModeCursorAuto, NavigationModeCursorForceVisible }; + + enum CursorMoveStyle { + LogicalMoveStyle, + VisualMoveStyle + }; } #ifdef Q_MOC_RUN ; 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 |