diff options
Diffstat (limited to 'tests/auto/quick/qquickdrag/tst_qquickdrag.cpp')
| -rw-r--r-- | tests/auto/quick/qquickdrag/tst_qquickdrag.cpp | 46 |
1 files changed, 11 insertions, 35 deletions
diff --git a/tests/auto/quick/qquickdrag/tst_qquickdrag.cpp b/tests/auto/quick/qquickdrag/tst_qquickdrag.cpp index dd61fd717d..b17b16b429 100644 --- a/tests/auto/quick/qquickdrag/tst_qquickdrag.cpp +++ b/tests/auto/quick/qquickdrag/tst_qquickdrag.cpp @@ -1,30 +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:GPL-EXCEPT$ -** 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 General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3 as published by the Free Software -** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT -** 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-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ +// Copyright (C) 2016 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include <QtTest/QtTest> #include <QtTest/QSignalSpy> @@ -33,6 +8,7 @@ #include <QtQml/qqmlcontext.h> #include <QtQml/qqmlengine.h> #include <QtQml/qqmlexpression.h> +#include <QQmlComponent> template <typename T> static T evaluate(QObject *scope, const QString &expression) { @@ -74,7 +50,7 @@ public: supportedActions = Qt::IgnoreAction; } - void dragEnterEvent(QDragEnterEvent *event) + void dragEnterEvent(QDragEnterEvent *event) override { ++enterEvents; position = event->position().toPoint(); @@ -84,7 +60,7 @@ public: event->setAccepted(accept); } - void dragMoveEvent(QDragMoveEvent *event) + void dragMoveEvent(QDragMoveEvent *event) override { ++moveEvents; position = event->position().toPoint(); @@ -94,13 +70,13 @@ public: event->setAccepted(accept); } - void dragLeaveEvent(QDragLeaveEvent *event) + void dragLeaveEvent(QDragLeaveEvent *event) override { ++leaveEvents; event->setAccepted(accept); } - void dropEvent(QDropEvent *event) + void dropEvent(QDropEvent *event) override { ++dropEvents; position = event->position().toPoint(); @@ -1044,28 +1020,28 @@ public: void setItem(QQuickItem *i) { item = i; } protected: - void dragEnterEvent(QDragEnterEvent *event) + void dragEnterEvent(QDragEnterEvent *event) override { TestDropTarget::dragEnterEvent(event); if (type == QEvent::DragEnter && enterEvents < 2) evaluate<void>(item, script); } - void dragMoveEvent(QDragMoveEvent *event) + void dragMoveEvent(QDragMoveEvent *event) override { TestDropTarget::dragMoveEvent(event); if (type == QEvent::DragMove && moveEvents < 2) evaluate<void>(item, script); } - void dragLeaveEvent(QDragLeaveEvent *event) + void dragLeaveEvent(QDragLeaveEvent *event) override { TestDropTarget::dragLeaveEvent(event); if (type == QEvent::DragLeave && leaveEvents < 2) evaluate<void>(item, script); } - void dropEvent(QDropEvent *event) + void dropEvent(QDropEvent *event) override { TestDropTarget::dropEvent(event); if (type == QEvent::Drop && dropEvents < 2) |