diff options
| author | Shawn Rutledge <shawn.rutledge@qt.io> | 2019-07-19 18:06:27 +0200 |
|---|---|---|
| committer | Shawn Rutledge <shawn.rutledge@qt.io> | 2019-07-23 14:43:35 +0000 |
| commit | aa4470943d0fafb20c8e90d5f5a71369a990189a (patch) | |
| tree | 3a1ee3e1884e0f3efedaed9faa043b9ad18cbb41 | |
| parent | 46cb35fccc1a8c4c6ca9c71c9701482a5598969e (diff) | |
Procrastinate QWheelEvent deprecations until 5.15
It turns out that Qt3D has uses of x() and y() in a header, which is
an error rather than just a warning. So we need more time to do
a qt5.git submodule update, then fix Qt3D. Amends
7d29807296cb7ccc7f3459e106d74f93a321c493
Change-Id: Ibead628e7094316bb17d5924f6c6f75dbda5826b
Reviewed-by: Liang Qi <liang.qi@qt.io>
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
| -rw-r--r-- | src/gui/kernel/qevent.cpp | 4 | ||||
| -rw-r--r-- | src/gui/kernel/qevent.h | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/gui/kernel/qevent.cpp b/src/gui/kernel/qevent.cpp index 2ec90433d6..ec52791010 100644 --- a/src/gui/kernel/qevent.cpp +++ b/src/gui/kernel/qevent.cpp @@ -758,7 +758,7 @@ QHoverEvent::~QHoverEvent() */ #if QT_CONFIG(wheelevent) -#if QT_DEPRECATED_SINCE(5, 14) +#if QT_DEPRECATED_SINCE(5, 15) /*! \obsolete This constructor has been deprecated. @@ -839,7 +839,7 @@ QWheelEvent::QWheelEvent(const QPointF &pos, const QPointF& globalPos, angleD(angleDelta), qt4D(qt4Delta), qt4O(qt4Orientation), mouseState(buttons), src(source), invertedScrolling(inverted), ph(phase) {} -#endif // QT_DEPRECATED_SINCE(5, 14) +#endif // QT_DEPRECATED_SINCE(5, 15) /*! Constructs a wheel event object. diff --git a/src/gui/kernel/qevent.h b/src/gui/kernel/qevent.h index d110529927..7653cc97e2 100644 --- a/src/gui/kernel/qevent.h +++ b/src/gui/kernel/qevent.h @@ -175,7 +175,7 @@ class Q_GUI_EXPORT QWheelEvent : public QInputEvent public: enum { DefaultDeltasPerStep = 120 }; -#if QT_DEPRECATED_SINCE(5, 14) +#if QT_DEPRECATED_SINCE(5, 15) // Actually deprecated since 5.0, in docs QT_DEPRECATED_X("Use the last QWheelEvent constructor taking pixelDelta, angleDelta, phase, and inverted") QWheelEvent(const QPointF &pos, int delta, @@ -213,7 +213,7 @@ public: inline QPoint pixelDelta() const { return pixelD; } inline QPoint angleDelta() const { return angleD; } -#if QT_DEPRECATED_SINCE(5, 14) +#if QT_DEPRECATED_SINCE(5, 15) // Actually deprecated since 5.0, in docs QT_DEPRECATED_X("Use angleDelta()") inline int delta() const { return qt4D; } @@ -238,7 +238,7 @@ public: inline const QPointF &posF() const { return p; } QT_DEPRECATED_X("Use globalPosition()") inline const QPointF &globalPosF() const { return g; } -#endif // QT_DEPRECATED_SINCE(5, 14) +#endif // QT_DEPRECATED_SINCE(5, 15) inline QPointF position() const { return p; } inline QPointF globalPosition() const { return g; } |