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 /src/quick/items/qquickitemsmodule_p.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 'src/quick/items/qquickitemsmodule_p.h')
| -rw-r--r-- | src/quick/items/qquickitemsmodule_p.h | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/src/quick/items/qquickitemsmodule_p.h b/src/quick/items/qquickitemsmodule_p.h index f7081f6ece..73bd8c6b69 100644 --- a/src/quick/items/qquickitemsmodule_p.h +++ b/src/quick/items/qquickitemsmodule_p.h @@ -53,6 +53,7 @@ #include <private/qtquickglobal_p.h> #include <QtGui/qevent.h> +#include <QtGui/qpointingdevice.h> #include <qqml.h> QT_BEGIN_NAMESPACE @@ -63,6 +64,24 @@ public: static void defineModule(); }; +struct QInputDeviceForeign +{ + Q_GADGET + QML_FOREIGN(QInputDevice) + QML_NAMED_ELEMENT(InputDevice) + QML_ADDED_IN_VERSION(6, 0) + QML_UNCREATABLE("InputDevice is only available via read-only properties.") +}; + +struct QPointingDeviceForeign +{ + Q_GADGET + QML_FOREIGN(QPointingDevice) + QML_NAMED_ELEMENT(PointerDevice) + QML_ADDED_IN_VERSION(6, 0) + QML_UNCREATABLE("PointerDevice is only available via read-only properties.") +}; + struct QPointingDeviceUniqueIdForeign { Q_GADGET |