diff options
| author | Ivan Solovev <ivan.solovev@qt.io> | 2022-07-14 15:01:03 +0200 |
|---|---|---|
| committer | Ivan Solovev <ivan.solovev@qt.io> | 2022-07-22 09:07:35 +0200 |
| commit | 929bb153eeb9e2c49778f65829146d11b815767a (patch) | |
| tree | ae7202a36624cd08dbec6259be4c9dd8bf6c0b22 /src/gui/kernel/qevent.cpp | |
| parent | 4b9c738185c771127eb8e7c73868f60bd31f7fce (diff) | |
| download | qtbase-929bb153eeb9e2c49778f65829146d11b815767a.tar.gz | |
Partly un-deprecate QMouseEvent::source()
We have deprecated the usage of Qt::MouseEventSource getter in
QMouseEvent::source() since 6.0. However, we have a lot of related
APIs, where the usage of this enum was not marked deprecated. Also we
have a lot of code in qtbase, qtdeclarative and some other modules
that rely on those values.
In most cases using QMouseEvent::source() is the only way to pass
the proper value to the other APIs.
This patch un-deprecates the method, so that we can safely identify
all of its usages in our code, and port away from it.
At the same time, we do not want the client code to use this method,
so documentation still mentions it as deprecated since 6.0.
Task-number: QTBUG-104857
Pick-to: 6.4 6.3 6.2
Change-Id: I767002aa6dc754fb5a58cf8fbf35774dae9986ed
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
Diffstat (limited to 'src/gui/kernel/qevent.cpp')
| -rw-r--r-- | src/gui/kernel/qevent.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/gui/kernel/qevent.cpp b/src/gui/kernel/qevent.cpp index c7c3953ce7..82d04d3a56 100644 --- a/src/gui/kernel/qevent.cpp +++ b/src/gui/kernel/qevent.cpp @@ -743,6 +743,7 @@ QMouseEvent::QMouseEvent(QEvent::Type type, const QPointF &localPos, const QPoin Q_IMPL_EVENT_COMMON(QMouseEvent) /*! + \fn Qt::MouseEventSource QMouseEvent::source() const \since 5.3 \deprecated [6.0] Use pointingDevice() instead. @@ -771,12 +772,13 @@ Q_IMPL_EVENT_COMMON(QMouseEvent) decide how to react to this event. But it's even better to react to the original event rather than handling only mouse events. */ -#if QT_DEPRECATED_SINCE(6, 0) +// Note: the docs mention 6.0 as a deprecation version. That is correct and +// intended, because we want our users to stop using it! Internally we will +// deprecate it when we port our code away from using it. Qt::MouseEventSource QMouseEvent::source() const { return Qt::MouseEventSource(m_source); } -#endif /*! \since 5.3 |