1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert to existing QPointingDevice::grabChanged signature until Qt 7

Browse Source 
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 <volker.hilsheimer@qt.io>
(cherry picked from commit a3b90360884dd11d896c43c74d64ff8d8f047052)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Shawn Rutledge 2023-02-18 19:38:19 +01:00 committed by Qt Cherry-pick Bot
parent 24e2e15b81
commit 066b639906
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/gui/kernel/qpointingdevice.h
View File

@ -107,12 +107,13 @@ public:
bool operator==(const QPointingDevice &other) const; bool operator==(const QPointingDevice &other) const;
Q_SIGNALS: Q_SIGNALS:
void grabChanged(QObject *grabber, QPointingDevice::GrabTransition transition,
const QPointerEvent *event, const QEventPoint &point)
#if QT_VERSION < QT_VERSION_CHECK(7, 0, 0) #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 #endif
;
protected: protected:
QPointingDevice(QPointingDevicePrivate &d, QObject *parent); QPointingDevice(QPointingDevicePrivate &d, QObject *parent);