diff options
Diffstat (limited to 'src/plugins/generic/libinput')
-rw-r--r-- | src/plugins/generic/libinput/CMakeLists.txt | 20 | ||||
-rw-r--r-- | src/plugins/generic/libinput/libinput.pro | 12 | ||||
-rw-r--r-- | src/plugins/generic/libinput/main.cpp | 44 |
3 files changed, 24 insertions, 52 deletions
diff --git a/src/plugins/generic/libinput/CMakeLists.txt b/src/plugins/generic/libinput/CMakeLists.txt new file mode 100644 index 0000000000..f92b3d5353 --- /dev/null +++ b/src/plugins/generic/libinput/CMakeLists.txt @@ -0,0 +1,20 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause + +##################################################################### +## QLibInputPlugin Plugin: +##################################################################### + +qt_internal_add_plugin(QLibInputPlugin + OUTPUT_NAME qlibinputplugin + PLUGIN_TYPE generic + DEFAULT_IF FALSE + SOURCES + main.cpp + LIBRARIES + Qt::Core + Qt::CorePrivate + Qt::Gui + Qt::GuiPrivate + Qt::InputSupportPrivate +) diff --git a/src/plugins/generic/libinput/libinput.pro b/src/plugins/generic/libinput/libinput.pro deleted file mode 100644 index 434bf7b945..0000000000 --- a/src/plugins/generic/libinput/libinput.pro +++ /dev/null @@ -1,12 +0,0 @@ -TARGET = qlibinputplugin - -QT += core-private gui-private input_support-private - -SOURCES = main.cpp - -OTHER_FILES = libinput.json - -PLUGIN_TYPE = generic -PLUGIN_EXTENDS = - -PLUGIN_CLASS_NAME = QLibInputPlugin -load(qt_plugin) diff --git a/src/plugins/generic/libinput/main.cpp b/src/plugins/generic/libinput/main.cpp index 6d1e76c0f0..a191fd3d9b 100644 --- a/src/plugins/generic/libinput/main.cpp +++ b/src/plugins/generic/libinput/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 QtGui module 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/qlibinputhandler_p.h> @@ -48,7 +12,7 @@ class QLibInputPlugin : public QGenericPlugin Q_PLUGIN_METADATA(IID QGenericPluginFactoryInterface_iid FILE "libinput.json") public: - QObject *create(const QString &key, const QString &specification); + QObject *create(const QString &key, const QString &specification) override; }; QObject *QLibInputPlugin::create(const QString &key, const QString &specification) @@ -56,7 +20,7 @@ QObject *QLibInputPlugin::create(const QString &key, const QString &specificatio if (!key.compare(QLatin1String("libinput"), Qt::CaseInsensitive)) return new QLibInputHandler(key, specification); - return 0; + return nullptr; } QT_END_NAMESPACE |