diff options
| author | Shawn Rutledge <shawn.rutledge@qt.io> | 2020-03-26 16:50:40 +0100 |
|---|---|---|
| committer | Shawn Rutledge <shawn.rutledge@qt.io> | 2020-06-23 17:44:03 +0200 |
| commit | d0ae3a312a03c118a1aa25a4c6c0352375d569fc (patch) | |
| tree | 01df3e8ea22c8a1ecd969a6e9e6d7014c635da9f /tests/manual/pointer/inputinspector.h | |
| parent | d5d6a56809032796444fe63c220a2e940ce237c0 (diff) | |
Remove QQuickPointerDevice in favor of QPointingDevice
...and generally deal with changes immediately required after adding
QInputDevice and QPointingDevice.
Also fixed a few usages of deprecated accessors that weren't taken
care of in 212c2bffbb041aee0e3c9a7f0551ef151ed2d3ad.
Task-number: QTBUG-46412
Task-number: QTBUG-69433
Task-number: QTBUG-72167
Change-Id: I93a2643162878afa216556f10808fd92e0b20071
Reviewed-by: Jan Arve Sæther <jan-arve.saether@qt.io>
Diffstat (limited to 'tests/manual/pointer/inputinspector.h')
| -rw-r--r-- | tests/manual/pointer/inputinspector.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/manual/pointer/inputinspector.h b/tests/manual/pointer/inputinspector.h index 66a053d0c3..0ef0a96987 100644 --- a/tests/manual/pointer/inputinspector.h +++ b/tests/manual/pointer/inputinspector.h @@ -32,7 +32,7 @@ #include <QObject> class QQuickWindow; class QQuickPointerHandler; -class QQuickPointerDevice; +class QPointingDevice; class InputInspector : public QObject { @@ -62,7 +62,7 @@ private: QVector<QObject*> passiveGrabbers_helper(int pointId = 0) const; QVector<QObject*> exclusiveGrabbers_helper(int pointId = 0) const; static QString objectIdentifier(QObject *o); - QQuickPointerDevice *pointerDevice() const; + const QPointingDevice *pointerDevice() const; QString vectorStringJoin(const QVector<QObject*> &arr) const; private: |