whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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
7d29807296

Change-Id: Ibead628e7094316bb17d5924f6c6f75dbda5826b
Reviewed-by: Liang Qi <liang.qi@qt.io>
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
bb10
Shawn Rutledge 2019-07-19 18:06:27 +02:00
parent 46cb35fccc
commit aa4470943d
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/gui/kernel/qevent.cpp
View File

@ -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.

6
src/gui/kernel/qevent.h
View File

@ -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; }