4 files changed, 9 insertions, 84 deletions
diff --git a/src/plugins/generic/tslib/.prev_CMakeLists.txt b/src/plugins/generic/tslib/.prev_CMakeLists.txt
deleted file mode 100644
index ce1c6b952f..0000000000
--- a/src/plugins/generic/tslib/.prev_CMakeLists.txt
+++ /dev/null
@@ -1,23 +0,0 @@
-# Generated from tslib.pro.
-
-#####################################################################
-## QTsLibPlugin Plugin:
-#####################################################################
-
-qt_internal_add_plugin(QTsLibPlugin
-    OUTPUT_NAME qtslibplugin
-    TYPE generic
-    SOURCES
-        main.cpp
-    PUBLIC_LIBRARIES
-        PkgConfig::Tslib
-        Qt::Core
-        Qt::CorePrivate
-        Qt::Gui
-        Qt::GuiPrivate
-        Qt::InputSupportPrivate
-)
-
-#### Keys ignored in scope 1:.:.:tslib.pro:<TRUE>:
-# OTHER_FILES = "tslib.json"
-# PLUGIN_EXTENDS = "-"
diff --git a/src/plugins/generic/tslib/CMakeLists.txt b/src/plugins/generic/tslib/CMakeLists.txt
index 7d234a2456..8512133799 100644
--- a/src/plugins/generic/tslib/CMakeLists.txt
+++ b/src/plugins/generic/tslib/CMakeLists.txt
@@ -1,6 +1,7 @@
-# Generated from tslib.pro.
+# Copyright (C) 2022 The Qt Company Ltd.
+# SPDX-License-Identifier: BSD-3-Clause
 
-qt_find_package(Tslib) # special case
+qt_find_package(Tslib)
 
 #####################################################################
 ## QTsLibPlugin Plugin:
@@ -8,10 +9,11 @@ qt_find_package(Tslib) # special case
 
 qt_internal_add_plugin(QTsLibPlugin
     OUTPUT_NAME qtslibplugin
-    TYPE generic
+    PLUGIN_TYPE generic
+    DEFAULT_IF FALSE
     SOURCES
         main.cpp
-    PUBLIC_LIBRARIES
+    LIBRARIES
         PkgConfig::Tslib
         Qt::Core
         Qt::CorePrivate
@@ -19,7 +21,3 @@ qt_internal_add_plugin(QTsLibPlugin
         Qt::GuiPrivate
         Qt::InputSupportPrivate
 )
-
-#### Keys ignored in scope 1:.:.:tslib.pro:<TRUE>:
-# OTHER_FILES = "tslib.json"
-# PLUGIN_EXTENDS = "-"
diff --git a/src/plugins/generic/tslib/main.cpp b/src/plugins/generic/tslib/main.cpp
index 5cd4b61a9d..c2f4ccb105 100644
--- a/src/plugins/generic/tslib/main.cpp
+++ b/src/plugins/generic/tslib/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/qtslib_p.h>
@@ -58,7 +22,7 @@ QObject* QTsLibPlugin::create(const QString &key,
         || !key.compare(QLatin1String("TslibRaw"), Qt::CaseInsensitive))
         return new QTsLibMouseHandler(key, specification);
 
-    return 0;
+    return nullptr;
 }
 
 QT_END_NAMESPACE
diff --git a/src/plugins/generic/tslib/tslib.pro b/src/plugins/generic/tslib/tslib.pro
deleted file mode 100644
index 7c3a0bf607..0000000000
--- a/src/plugins/generic/tslib/tslib.pro
+++ /dev/null
@@ -1,14 +0,0 @@
-TARGET = qtslibplugin
-
-SOURCES = main.cpp
-
-QT += core-private gui-private input_support-private
-
-QMAKE_USE += tslib
-
-OTHER_FILES += tslib.json
-
-PLUGIN_TYPE = generic
-PLUGIN_EXTENDS = -
-PLUGIN_CLASS_NAME = QTsLibPlugin
-load(qt_plugin)