diff options
Diffstat (limited to 'src/plugins/generic/evdevtablet')
| -rw-r--r-- | src/plugins/generic/evdevtablet/CMakeLists.txt | 11 | ||||
| -rw-r--r-- | src/plugins/generic/evdevtablet/evdevtablet.pro | 13 | ||||
| -rw-r--r-- | src/plugins/generic/evdevtablet/main.cpp | 42 |
3 files changed, 7 insertions, 59 deletions
diff --git a/src/plugins/generic/evdevtablet/CMakeLists.txt b/src/plugins/generic/evdevtablet/CMakeLists.txt index da553f9b47..ef21469f70 100644 --- a/src/plugins/generic/evdevtablet/CMakeLists.txt +++ b/src/plugins/generic/evdevtablet/CMakeLists.txt @@ -1,4 +1,5 @@ -# Generated from evdevtablet.pro. +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause ##################################################################### ## QEvdevTabletPlugin Plugin: @@ -6,18 +7,14 @@ qt_internal_add_plugin(QEvdevTabletPlugin OUTPUT_NAME qevdevtabletplugin - TYPE generic + PLUGIN_TYPE generic DEFAULT_IF FALSE SOURCES main.cpp - PUBLIC_LIBRARIES + LIBRARIES Qt::Core Qt::CorePrivate Qt::Gui Qt::GuiPrivate Qt::InputSupportPrivate ) - -#### Keys ignored in scope 1:.:.:evdevtablet.pro:<TRUE>: -# OTHER_FILES = "evdevtablet.json" -# PLUGIN_EXTENDS = "-" diff --git a/src/plugins/generic/evdevtablet/evdevtablet.pro b/src/plugins/generic/evdevtablet/evdevtablet.pro deleted file mode 100644 index 1409cd83c9..0000000000 --- a/src/plugins/generic/evdevtablet/evdevtablet.pro +++ /dev/null @@ -1,13 +0,0 @@ -TARGET = qevdevtabletplugin - -SOURCES = main.cpp - -QT += core-private gui-private input_support-private - -OTHER_FILES += \ - evdevtablet.json - -PLUGIN_TYPE = generic -PLUGIN_EXTENDS = - -PLUGIN_CLASS_NAME = QEvdevTabletPlugin -load(qt_plugin) diff --git a/src/plugins/generic/evdevtablet/main.cpp b/src/plugins/generic/evdevtablet/main.cpp index f43a32910d..6313c09921 100644 --- a/src/plugins/generic/evdevtablet/main.cpp +++ b/src/plugins/generic/evdevtablet/main.cpp @@ -1,41 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the plugins 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 #include <QtGui/qgenericplugin.h> #include <QtInputSupport/private/qevdevtabletmanager_p.h> @@ -63,7 +27,7 @@ QObject* QEvdevTabletPlugin::create(const QString &key, if (!key.compare(QLatin1String("EvdevTablet"), Qt::CaseInsensitive)) return new QEvdevTabletManager(key, spec); - return 0; + return nullptr; } QT_END_NAMESPACE |