From 066b639906d1723bd13210151738aca16cd06b34 Mon Sep 17 00:00:00 2001 From: Shawn Rutledge Date: Sat, 18 Feb 2023 19:38:19 +0100 Subject: [PATCH] Revert to existing QPointingDevice::grabChanged signature until Qt 7 There is concern about string-based connect() source compatibility in the case that a signal argument has a different type name. Amends bc857f466d297e5656fadad4987f218900d6b1a6 Change-Id: I2618b8c5f62b39717e4f7043d07168e808390b1d Reviewed-by: Volker Hilsheimer (cherry picked from commit a3b90360884dd11d896c43c74d64ff8d8f047052) Reviewed-by: Qt Cherry-pick Bot --- src/gui/kernel/qpointingdevice.h | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/gui/kernel/qpointingdevice.h b/src/gui/kernel/qpointingdevice.h index f1b156bcb6d..b8e6460af7f 100644 --- a/src/gui/kernel/qpointingdevice.h +++ b/src/gui/kernel/qpointingdevice.h @@ -107,12 +107,13 @@ public: bool operator==(const QPointingDevice &other) const; Q_SIGNALS: - void grabChanged(QObject *grabber, QPointingDevice::GrabTransition transition, - const QPointerEvent *event, const QEventPoint &point) #if QT_VERSION < QT_VERSION_CHECK(7, 0, 0) - const + void grabChanged(QObject *grabber, GrabTransition transition, + const QPointerEvent *event, const QEventPoint &point) const; +#else + void grabChanged(QObject *grabber, QPointingDevice::GrabTransition transition, + const QPointerEvent *event, const QEventPoint &point); #endif - ; protected: QPointingDevice(QPointingDevicePrivate &d, QObject *parent);