diff options
Diffstat (limited to 'tests/auto/shared')
-rw-r--r-- | tests/auto/shared/highdpi.h | 29 | ||||
-rw-r--r-- | tests/auto/shared/platformclipboard.h | 29 | ||||
-rw-r--r-- | tests/auto/shared/platforminputcontext.h | 35 | ||||
-rw-r--r-- | tests/auto/shared/resources/test.ttf | bin | 2128 -> 2196 bytes | |||
-rw-r--r-- | tests/auto/shared/resources/testfont_variable.ttf | bin | 0 -> 28528 bytes |
5 files changed, 6 insertions, 87 deletions
diff --git a/tests/auto/shared/highdpi.h b/tests/auto/shared/highdpi.h index f0c34bea25..8aa4c8c3d7 100644 --- a/tests/auto/shared/highdpi.h +++ b/tests/auto/shared/highdpi.h @@ -1,30 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2019 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) 2019 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #ifndef HIGHDPI_H #define HIGHDPI_H diff --git a/tests/auto/shared/platformclipboard.h b/tests/auto/shared/platformclipboard.h index 15801f6add..1e90f01977 100644 --- a/tests/auto/shared/platformclipboard.h +++ b/tests/auto/shared/platformclipboard.h @@ -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 #ifndef PLATFORMCLIPBOARD_H #define PLATFORMCLIPBOARD_H diff --git a/tests/auto/shared/platforminputcontext.h b/tests/auto/shared/platforminputcontext.h index be05296e2b..31fa51441d 100644 --- a/tests/auto/shared/platforminputcontext.h +++ b/tests/auto/shared/platforminputcontext.h @@ -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 <qpa/qplatforminputcontext.h> @@ -42,7 +17,6 @@ public: m_lastQueries(Qt::ImhNone), m_action(QInputMethod::Click), m_cursorPosition(0), - m_lastEventType(QEvent::None), m_setFocusObjectCallCount(0) {} @@ -76,10 +50,6 @@ public: m_action = action; m_cursorPosition = cursorPosition; } - virtual bool filterEvent(const QEvent *event) override - { - m_lastEventType = event->type(); return false; - } virtual void showInputPanel() override { m_visible = true; @@ -119,7 +89,6 @@ public: Qt::InputMethodQueries m_lastQueries; QInputMethod::Action m_action; int m_cursorPosition; - int m_lastEventType; QRectF m_keyboardRect; int m_setFocusObjectCallCount; }; diff --git a/tests/auto/shared/resources/test.ttf b/tests/auto/shared/resources/test.ttf Binary files differindex b2bb6cd036..8b56c046d4 100644 --- a/tests/auto/shared/resources/test.ttf +++ b/tests/auto/shared/resources/test.ttf diff --git a/tests/auto/shared/resources/testfont_variable.ttf b/tests/auto/shared/resources/testfont_variable.ttf Binary files differnew file mode 100644 index 0000000000..b3d7be6180 --- /dev/null +++ b/tests/auto/shared/resources/testfont_variable.ttf |