diff options
| author | Shawn Rutledge <shawn.rutledge@qt.io> | 2021-08-27 16:15:28 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-08-27 20:25:07 +0000 |
| commit | 5268194b2302fa3371de785854468d1a2649ff14 (patch) | |
| tree | 2cadfdcecc9c78dca5f373b6c7e7bf3194ea145b | |
| parent | ea6cc84ab2da971b901b87b6cce25d119f94f409 (diff) | |
Fix deprecation of QMouseEvent::source() and flags()
Amends 53496e67f0b78645c6080e9218c7a36bc5a9d76d:
- move flags() out of the QT_DEPRECATED_SINCE block in the header
- add QT_DEPRECATED_SINCE block around source() implementation
Change-Id: Id52fa6b04a13efbede3e6ac440060f90b283e773
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
(cherry picked from commit ba8f9d8d92ba4fd9aaf6e0885b56b56e25acfc45)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | src/gui/kernel/qevent.cpp | 2 | ||||
| -rw-r--r-- | src/gui/kernel/qevent.h | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/gui/kernel/qevent.cpp b/src/gui/kernel/qevent.cpp index ff9ec52b09..fd3f55bd9c 100644 --- a/src/gui/kernel/qevent.cpp +++ b/src/gui/kernel/qevent.cpp @@ -804,10 +804,12 @@ QMouseEvent::~QMouseEvent() \sa Qt::MouseEventSource \sa QGraphicsSceneMouseEvent::source() */ +#if QT_DEPRECATED_SINCE(6, 0) Qt::MouseEventSource QMouseEvent::source() const { return Qt::MouseEventSource(m_source); } +#endif /*! \since 5.3 diff --git a/src/gui/kernel/qevent.h b/src/gui/kernel/qevent.h index 9c53f7ce92..1c9643fa98 100644 --- a/src/gui/kernel/qevent.h +++ b/src/gui/kernel/qevent.h @@ -273,8 +273,8 @@ public: QT_DEPRECATED_VERSION_X_6_0("Use globalPosition()") QPointF screenPos() const { return globalPosition(); } Qt::MouseEventSource source() const; - Qt::MouseEventFlags flags() const; #endif // QT_DEPRECATED_SINCE(6, 0) + Qt::MouseEventFlags flags() const; }; class Q_GUI_EXPORT QHoverEvent : public QSinglePointEvent |