diff options
Diffstat (limited to 'src/quick/handlers/qquickpointerdevicehandler_p.h')
| -rw-r--r-- | src/quick/handlers/qquickpointerdevicehandler_p.h | 51 |
1 files changed, 7 insertions, 44 deletions
diff --git a/src/quick/handlers/qquickpointerdevicehandler_p.h b/src/quick/handlers/qquickpointerdevicehandler_p.h index 6091646c14..50f6e1d7e0 100644 --- a/src/quick/handlers/qquickpointerdevicehandler_p.h +++ b/src/quick/handlers/qquickpointerdevicehandler_p.h @@ -1,41 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2018 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the QtQuick module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or (at your option) the GNU General -** Public license version 3 or any later version approved by the KDE Free -** Qt Foundation. The licenses are as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-2.0.html and -** https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ +// Copyright (C) 2018 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #include "qquickpointerhandler_p.h" #ifndef QQUICKPOINTERDEVICEHANDLER_H @@ -56,10 +20,11 @@ QT_BEGIN_NAMESPACE class QQuickPointerDeviceHandlerPrivate; -class Q_QUICK_PRIVATE_EXPORT QQuickPointerDeviceHandler : public QQuickPointerHandler +class Q_QUICK_EXPORT QQuickPointerDeviceHandler : public QQuickPointerHandler { Q_OBJECT - Q_PROPERTY(QPointingDevice::DeviceTypes acceptedDevices READ acceptedDevices WRITE setAcceptedDevices NOTIFY acceptedDevicesChanged) + Q_PROPERTY(QInputDevice::DeviceTypes acceptedDevices READ acceptedDevices WRITE + setAcceptedDevices NOTIFY acceptedDevicesChanged) Q_PROPERTY(QPointingDevice::PointerTypes acceptedPointerTypes READ acceptedPointerTypes WRITE setAcceptedPointerTypes NOTIFY acceptedPointerTypesChanged) Q_PROPERTY(Qt::MouseButtons acceptedButtons READ acceptedButtons WRITE setAcceptedButtons NOTIFY acceptedButtonsChanged) Q_PROPERTY(Qt::KeyboardModifiers acceptedModifiers READ acceptedModifiers WRITE setAcceptedModifiers NOTIFY acceptedModifiersChanged) @@ -67,13 +32,13 @@ class Q_QUICK_PRIVATE_EXPORT QQuickPointerDeviceHandler : public QQuickPointerHa public: explicit QQuickPointerDeviceHandler(QQuickItem *parent = nullptr); - QPointingDevice::DeviceTypes acceptedDevices() const; + QInputDevice::DeviceTypes acceptedDevices() const; QPointingDevice::PointerTypes acceptedPointerTypes() const; Qt::MouseButtons acceptedButtons() const; Qt::KeyboardModifiers acceptedModifiers() const; public Q_SLOTS: - void setAcceptedDevices(QPointingDevice::DeviceTypes acceptedDevices); + void setAcceptedDevices(QInputDevice::DeviceTypes acceptedDevices); void setAcceptedPointerTypes(QPointingDevice::PointerTypes acceptedPointerTypes); void setAcceptedButtons(Qt::MouseButtons buttons); void setAcceptedModifiers(Qt::KeyboardModifiers acceptedModifiers); @@ -94,6 +59,4 @@ protected: QT_END_NAMESPACE -QML_DECLARE_TYPE(QQuickPointerDeviceHandler) - #endif // QQUICKPOINTERDEVICEHANDLER_H |