diff options
Diffstat (limited to 'src/compositor/extensions/qwaylandqttextinputmethod.cpp')
-rw-r--r-- | src/compositor/extensions/qwaylandqttextinputmethod.cpp | 36 |
1 files changed, 6 insertions, 30 deletions
diff --git a/src/compositor/extensions/qwaylandqttextinputmethod.cpp b/src/compositor/extensions/qwaylandqttextinputmethod.cpp index 5119373a6..edcf28d30 100644 --- a/src/compositor/extensions/qwaylandqttextinputmethod.cpp +++ b/src/compositor/extensions/qwaylandqttextinputmethod.cpp @@ -1,31 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2020 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the QtWaylandCompositor module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:GPL$ -** 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 or (at your option) 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.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-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ +// Copyright (C) 2020 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include "qwaylandqttextinputmethod.h" #include "qwaylandqttextinputmethod_p.h" @@ -123,7 +97,7 @@ void QWaylandQtTextInputMethodPrivate::text_input_method_v1_start_update(Resourc void QWaylandQtTextInputMethodPrivate::text_input_method_v1_update_hints(Resource *resource, int32_t hints) { if (this->resource == resource) - hints = Qt::InputMethodHints(hints); + this->hints = Qt::InputMethodHints(hints); } void QWaylandQtTextInputMethodPrivate::text_input_method_v1_update_anchor_position(Resource *resource, int32_t anchorPosition) @@ -306,7 +280,7 @@ void QWaylandQtTextInputMethod::sendInputMethodEvent(QInputMethodEvent *event) attribute.type, attribute.start, attribute.length, - attribute.value.type() == QVariant::Color ? attribute.value.value<QColor>().name() : QString()); + attribute.value.typeId() == QMetaType::QColor ? attribute.value.value<QColor>().name() : QString()); break; case QInputMethodEvent::Language: // ### What is the type of value? Is it string? Q_FALLTHROUGH(); @@ -457,3 +431,5 @@ QByteArray QWaylandQtTextInputMethod::interfaceName() } QT_END_NAMESPACE + +#include "moc_qwaylandqttextinputmethod.cpp" |