diff options
Diffstat (limited to 'src/quick/handlers/qquickwheelhandler_p.h')
| -rw-r--r-- | src/quick/handlers/qquickwheelhandler_p.h | 54 |
1 files changed, 11 insertions, 43 deletions
diff --git a/src/quick/handlers/qquickwheelhandler_p.h b/src/quick/handlers/qquickwheelhandler_p.h index cbc9c4328c..38d6fea8e6 100644 --- a/src/quick/handlers/qquickwheelhandler_p.h +++ b/src/quick/handlers/qquickwheelhandler_p.h @@ -1,41 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2019 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) 2019 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 #ifndef QQUICKWHEELHANDLER_H #define QQUICKWHEELHANDLER_H @@ -51,8 +15,9 @@ // We mean it. // -#include "qquickitem.h" -#include "qevent.h" +#include <QtGui/qevent.h> +#include <QtQuick/qquickitem.h> + #include "qquicksinglepointhandler_p.h" QT_BEGIN_NAMESPACE @@ -60,7 +25,7 @@ QT_BEGIN_NAMESPACE class QQuickWheelEvent; class QQuickWheelHandlerPrivate; -class Q_QUICK_PRIVATE_EXPORT QQuickWheelHandler : public QQuickSinglePointHandler +class Q_QUICK_EXPORT QQuickWheelHandler : public QQuickSinglePointHandler { Q_OBJECT Q_PROPERTY(Qt::Orientation orientation READ orientation WRITE setOrientation NOTIFY orientationChanged) @@ -71,6 +36,7 @@ class Q_QUICK_PRIVATE_EXPORT QQuickWheelHandler : public QQuickSinglePointHandle Q_PROPERTY(QString property READ property WRITE setProperty NOTIFY propertyChanged) Q_PROPERTY(qreal targetScaleMultiplier READ targetScaleMultiplier WRITE setTargetScaleMultiplier NOTIFY targetScaleMultiplierChanged) Q_PROPERTY(bool targetTransformAroundCursor READ isTargetTransformAroundCursor WRITE setTargetTransformAroundCursor NOTIFY targetTransformAroundCursorChanged) + Q_PROPERTY(bool blocking READ isBlocking WRITE setBlocking NOTIFY blockingChanged REVISION(6, 3)) QML_NAMED_ELEMENT(WheelHandler) QML_ADDED_IN_VERSION(2, 14) @@ -102,6 +68,9 @@ public: bool isTargetTransformAroundCursor() const; void setTargetTransformAroundCursor(bool ttac); + bool isBlocking() const; + void setBlocking(bool blocking); + Q_SIGNALS: void wheel(QQuickWheelEvent *event); @@ -113,6 +82,7 @@ Q_SIGNALS: void propertyChanged(); void targetScaleMultiplierChanged(); void targetTransformAroundCursorChanged(); + Q_REVISION(6, 3) void blockingChanged(); protected: bool wantsPointerEvent(QPointerEvent *event) override; @@ -126,6 +96,4 @@ protected: QT_END_NAMESPACE -QML_DECLARE_TYPE(QQuickWheelHandler) - #endif // QQUICKWHEELHANDLER_H |