diff options
| author | J-P Nurmi <jpnurmi@digia.com> | 2013-08-10 15:19:27 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-08-15 10:02:36 +0200 |
| commit | 751989df5cc441dcffbbbe2da0c3c0558701d5c6 (patch) | |
| tree | faaed4ab993c54924da0be15ec7c090c0041ab18 /src/corelib/global | |
| parent | 8e13a9792afcaf1be901ac00418b30372e818fde (diff) | |
Replace QWheelEvent::Phase with revised Qt::ScrollPhase
Change-Id: I4d8e7d48497d0d96a297191976c0d99feb67b538
Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
Diffstat (limited to 'src/corelib/global')
| -rw-r--r-- | src/corelib/global/qnamespace.h | 7 | ||||
| -rw-r--r-- | src/corelib/global/qnamespace.qdoc | 15 |
2 files changed, 22 insertions, 0 deletions
diff --git a/src/corelib/global/qnamespace.h b/src/corelib/global/qnamespace.h index e714839f26..9b63166474 100644 --- a/src/corelib/global/qnamespace.h +++ b/src/corelib/global/qnamespace.h @@ -95,6 +95,7 @@ Qt { #endif Q_ENUMS(CursorMoveStyle) Q_ENUMS(TimerType) + Q_ENUMS(ScrollPhase) #endif // defined(Q_MOC_RUN) #if defined(Q_MOC_RUN) @@ -1569,6 +1570,12 @@ public: CoarseTimer, VeryCoarseTimer }; + + enum ScrollPhase { + ScrollBegin = 1, + ScrollUpdate, + ScrollEnd + }; } #ifdef Q_MOC_RUN ; diff --git a/src/corelib/global/qnamespace.qdoc b/src/corelib/global/qnamespace.qdoc index 4a5285fa5d..22e48e9796 100644 --- a/src/corelib/global/qnamespace.qdoc +++ b/src/corelib/global/qnamespace.qdoc @@ -2878,3 +2878,18 @@ nearest full second (e.g. an interval of 23500ms will be rounded to 24000ms, and 20300ms to 20000ms). */ + +/*! + \enum Qt::ScrollPhase + \since 5.2 + + This enum describes the phase of scrolling. + + \value ScrollBegin Scrolling is about to begin, but the scrolling + distance did not yet change. + + \value ScrollUpdate The scrolling distance has changed (default). + + \value ScrollEnd Scrolling has ended, but the scrolling distance + did not change anymore. +*/ |