diff options
| author | Morten Johan Sorvig <morten.sorvig@nokia.com> | 2012-04-26 10:29:16 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-04-27 14:41:42 +0200 |
| commit | 1d72e3fbdfdef979b90a94b53a98ac52e7282a36 (patch) | |
| tree | 635a7c16b0d9aa06a7a096b9c18ef1b93b82d80f /src/gui | |
| parent | 4a2942085a4d82e66b001c60e535f3a37808a0e8 (diff) | |
Remove deprecation tags from QWheelEvent.
0df1c9f1 enabled deprecation warnings from Qt,
causing warnings from QWheelEvent use.
Using delta() and orientation() in new code is still
not advised, but since QtWidgets uses them the
"deprecated" tag is not suitable.
Change-Id: I597e8ddf9fd2dc911d0e30044e96df744982ff81
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/kernel/qevent.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/gui/kernel/qevent.h b/src/gui/kernel/qevent.h index d94257f7c0..4c019938b8 100644 --- a/src/gui/kernel/qevent.h +++ b/src/gui/kernel/qevent.h @@ -158,10 +158,8 @@ public: inline QPoint pixelDelta() const { return pixelD; } inline QPoint angleDelta() const { return angleD; } -#if QT_DEPRECATED_SINCE(5, 0) - inline QT_DEPRECATED int delta() const { return qt4D; } - inline QT_DEPRECATED Qt::Orientation orientation() const { return qt4O; } -#endif + inline int delta() const { return qt4D; } + inline Qt::Orientation orientation() const { return qt4O; } #ifndef QT_NO_INTEGER_EVENT_COORDINATES inline QPoint pos() const { return p.toPoint(); } |