diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2022-11-13 01:38:07 +0100 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2022-11-13 01:38:07 +0100 |
commit | c7333d7d77a6d8675d27e015dd4ca68b0ea7bc1f (patch) | |
tree | b8dfa3c693057ec513d31909bb497f05fc76d90c /tests/manual/widgets/inputmethods/controlview.h | |
parent | 7dd16127e0236f0df6d62ebc09b18e25de250dbe (diff) | |
parent | 885bec2640f65c32a42d6d4ea4e7882eef2b3530 (diff) |
Merge "Merge remote-tracking branch 'origin/6.4' into tqtc/lts-6.2"
Diffstat (limited to 'tests/manual/widgets/inputmethods/controlview.h')
-rw-r--r-- | tests/manual/widgets/inputmethods/controlview.h | 36 |
1 files changed, 6 insertions, 30 deletions
diff --git a/tests/manual/widgets/inputmethods/controlview.h b/tests/manual/widgets/inputmethods/controlview.h index 0ef10f6a8..f6b3e7fe6 100644 --- a/tests/manual/widgets/inputmethods/controlview.h +++ b/tests/manual/widgets/inputmethods/controlview.h @@ -1,30 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the QtWebEngine module 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 WITH Qt-GPL-exception-1.0 #ifndef CONTROLVIEW_H #define CONTROLVIEW_H @@ -46,12 +21,13 @@ class ControlView : public QWidget public: explicit ControlView(QWidget *parent = 0); + const QString getText() const; + const QList<QInputMethodEvent::Attribute> getAtrributes() const; + public slots: void receiveInputMethodData(int, int, QTextCharFormat::UnderlineStyle, const QColor &, const QColor &, const QString &); - void createAndSendInputMethodEvent(); - signals: - void sendInputMethodEvent(QInputMethodEvent); + void requestInputMethodEvent(); private: QComboBox *m_underlineStyleCombo; |