diff options
| author | Paul Lemire <paul.lemire@kdab.com> | 2015-12-03 10:58:46 +0100 |
|---|---|---|
| committer | Sean Harmer <sean.harmer@kdab.com> | 2015-12-04 19:07:41 +0000 |
| commit | 19d8d0443bed987a997f486c70ffb9ad62bc1419 (patch) | |
| tree | 8d02f1f32f92f7c15fafe1a97eef02dbb46424a8 /src/input/frontend/qactioninput.h | |
| parent | c9961da49757b5d76164a5334ed1f114fffcfca0 (diff) | |
QAxisInput/QActionInput: use list of int rather than int mask
Needed to allow devices like keyboards which have more than 64 keys
Change-Id: Ia837285ba9c5b7c26d3d89046d7d9f7a4cddb2ba
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src/input/frontend/qactioninput.h')
| -rw-r--r-- | src/input/frontend/qactioninput.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/input/frontend/qactioninput.h b/src/input/frontend/qactioninput.h index 537e7e1e0..37e9c7957 100644 --- a/src/input/frontend/qactioninput.h +++ b/src/input/frontend/qactioninput.h @@ -51,7 +51,7 @@ class QT3DINPUTSHARED_EXPORT QActionInput : public Qt3DCore::QNode { Q_OBJECT Q_PROPERTY(Qt3DInput::QAbstractPhysicalDevice *sourceDevice READ sourceDevice WRITE setSourceDevice NOTIFY sourceDeviceChanged) - Q_PROPERTY(int keys READ keys WRITE setKeys NOTIFY keysChanged) + Q_PROPERTY(QVariantList keys READ keys WRITE setKeys NOTIFY keysChanged) public: explicit QActionInput(Qt3DCore::QNode *parent = Q_NULLPTR); @@ -60,8 +60,8 @@ public: void setSourceDevice(QAbstractPhysicalDevice *sourceDevice); QAbstractPhysicalDevice *sourceDevice() const; - void setKeys(int keys); - int keys() const; + void setKeys(const QVariantList &keys); + QVariantList keys() const; Q_SIGNALS: void sourceDeviceChanged(); |