diff options
| author | Jan Arve Saether <jan-arve.saether@qt.io> | 2017-02-22 14:19:12 +0100 |
|---|---|---|
| committer | Jan Arve Sæther <jan-arve.saether@qt.io> | 2017-02-23 12:29:10 +0000 |
| commit | e53510944169ac9f6753e0d14e1b24a24ff7bd9a (patch) | |
| tree | 117b20c0045b0fcf4a0dd2f744068e75b607731d /src/quick/handlers/qquickpointerdevicehandler_p.h | |
| parent | ac61ca1a2e18bd472d36fdad730a797a913fe347 (diff) | |
API: Move acceptedButtons to QQuickPointerSingleHandler
Change-Id: I8cb393986e587e69d550ec03f691258c79d9237a
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
Diffstat (limited to 'src/quick/handlers/qquickpointerdevicehandler_p.h')
| -rw-r--r-- | src/quick/handlers/qquickpointerdevicehandler_p.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/src/quick/handlers/qquickpointerdevicehandler_p.h b/src/quick/handlers/qquickpointerdevicehandler_p.h index 2ca7310da8..76c9cc44f0 100644 --- a/src/quick/handlers/qquickpointerdevicehandler_p.h +++ b/src/quick/handlers/qquickpointerdevicehandler_p.h @@ -60,7 +60,6 @@ class Q_AUTOTEST_EXPORT QQuickPointerDeviceHandler : public QQuickPointerHandler Q_OBJECT Q_PROPERTY(QQuickPointerDevice::DeviceTypes acceptedDevices READ acceptedDevices WRITE setAcceptedDevices NOTIFY acceptedDevicesChanged) Q_PROPERTY(QQuickPointerDevice::PointerTypes acceptedPointerTypes READ acceptedPointerTypes WRITE setAcceptedPointerTypes NOTIFY acceptedPointerTypesChanged) - Q_PROPERTY(Qt::MouseButtons acceptedButtons READ acceptedButtons WRITE setAcceptedButtons NOTIFY acceptedButtonsChanged) public: explicit QQuickPointerDeviceHandler(QObject *parent = 0); @@ -68,17 +67,14 @@ public: QQuickPointerDevice::DeviceTypes acceptedDevices() const { return m_acceptedDevices; } QQuickPointerDevice::PointerTypes acceptedPointerTypes() const { return m_acceptedPointerTypes; } - Qt::MouseButtons acceptedButtons() const { return m_acceptedButtons; } public slots: void setAcceptedDevices(QQuickPointerDevice::DeviceTypes acceptedDevices); void setAcceptedPointerTypes(QQuickPointerDevice::PointerTypes acceptedPointerTypes); - void setAcceptedButtons(Qt::MouseButtons buttons); Q_SIGNALS: void acceptedDevicesChanged(); void acceptedPointerTypesChanged(); - void acceptedButtonsChanged(); protected: bool wantsPointerEvent(QQuickPointerEvent *event) override; @@ -86,7 +82,6 @@ protected: protected: QQuickPointerDevice::DeviceTypes m_acceptedDevices; QQuickPointerDevice::PointerTypes m_acceptedPointerTypes; - Qt::MouseButtons m_acceptedButtons; }; QT_END_NAMESPACE |