diff options
Diffstat (limited to 'src/qmltest/quicktestevent_p.h')
-rw-r--r-- | src/qmltest/quicktestevent_p.h | 48 |
1 files changed, 6 insertions, 42 deletions
diff --git a/src/qmltest/quicktestevent_p.h b/src/qmltest/quicktestevent_p.h index 8e823e46a4..6f73130b5b 100644 --- a/src/qmltest/quicktestevent_p.h +++ b/src/qmltest/quicktestevent_p.h @@ -1,41 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the test suite 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) 2016 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 QUICKTESTEVENT_P_H #define QUICKTESTEVENT_P_H @@ -61,7 +25,7 @@ QT_BEGIN_NAMESPACE class QuickTestEvent; -class Q_QUICK_TEST_PRIVATE_EXPORT QQuickTouchEventSequence : public QObject +class Q_QMLTEST_EXPORT QQuickTouchEventSequence : public QObject { Q_OBJECT QML_ANONYMOUS @@ -69,7 +33,7 @@ class Q_QUICK_TEST_PRIVATE_EXPORT QQuickTouchEventSequence : public QObject public: explicit QQuickTouchEventSequence(QuickTestEvent *testEvent, QObject *item = nullptr); -public slots: +public Q_SLOTS: QObject* press(int touchId, QObject *item, qreal x, qreal y); QObject* move(int touchId, QObject *item, qreal x, qreal y); QObject* release(int touchId, QObject *item, qreal x, qreal y); @@ -81,7 +45,7 @@ private: QuickTestEvent * const m_testEvent; }; -class Q_QUICK_TEST_PRIVATE_EXPORT QuickTestEvent : public QObject +class Q_QMLTEST_EXPORT QuickTestEvent : public QObject { Q_OBJECT Q_PROPERTY(int defaultMouseDelay READ defaultMouseDelay FINAL) @@ -113,7 +77,7 @@ public Q_SLOTS: int modifiers, int delay); bool mouseDoubleClickSequence(QObject *item, qreal x, qreal y, int button, int modifiers, int delay); - bool mouseMove(QObject *item, qreal x, qreal y, int delay, int buttons); + bool mouseMove(QObject *item, qreal x, qreal y, int delay, int buttons, int modifiers); #if QT_CONFIG(wheelevent) bool mouseWheel(QObject *item, qreal x, qreal y, int buttons, |