10 files changed, 56 insertions, 17 deletions
diff --git a/src/plugins/generic/.prev_CMakeLists.txt b/src/plugins/generic/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..b3851ffbd1
--- /dev/null
+++ b/src/plugins/generic/.prev_CMakeLists.txt
@@ -0,0 +1,23 @@
+# Generated from generic.pro.
+
+if(QT_FEATURE_evdev)
+    add_subdirectory(evdevmouse)
+    add_subdirectory(evdevtouch)
+    add_subdirectory(evdevkeyboard)
+endif()
+if(QT_FEATURE_evdev AND QT_FEATURE_tabletevent)
+    add_subdirectory(evdevtablet)
+endif()
+if(QT_FEATURE_tslib)
+    add_subdirectory(tslib)
+endif()
+if(QT_FEATURE_tuiotouch)
+    add_subdirectory(tuiotouch)
+endif()
+if(QT_FEATURE_libinput)
+    add_subdirectory(libinput)
+endif()
+if(FREEBSD)
+    add_subdirectory(bsdkeyboard)
+    add_subdirectory(bsdmouse)
+endif()
diff --git a/src/plugins/generic/CMakeLists.txt b/src/plugins/generic/CMakeLists.txt
index 487a79b22b..f5890d0961 100644
--- a/src/plugins/generic/CMakeLists.txt
+++ b/src/plugins/generic/CMakeLists.txt
@@ -1,26 +1,23 @@
+# Generated from generic.pro.
+
 if(QT_FEATURE_evdev)
     add_subdirectory(evdevmouse)
     add_subdirectory(evdevtouch)
     add_subdirectory(evdevkeyboard)
-
-    if(QT_FEATURE_tabletevent)
-        add_subdirectory(evdevtablet)
-    endif()
 endif()
-
+if(QT_FEATURE_evdev AND QT_FEATURE_tabletevent)
+    add_subdirectory(evdevtablet)
+endif()
 if(QT_FEATURE_tslib)
     add_subdirectory(tslib)
 endif()
-
 if(QT_FEATURE_tuiotouch)
     add_subdirectory(tuiotouch)
 endif()
-
 if(QT_FEATURE_libinput)
     add_subdirectory(libinput)
 endif()
-
 if(FREEBSD)
-#   TODO  add_subdirectory(bsdkeyboard)
-#   TODO  add_subdirectory(bsdmouse)
+    # add_subdirectory(bsdkeyboard) # special case TODO
+    # add_subdirectory(bsdmouse) # special case TODO
 endif()
diff --git a/src/plugins/generic/evdevkeyboard/CMakeLists.txt b/src/plugins/generic/evdevkeyboard/CMakeLists.txt
index 866dc5f574..59510d604e 100644
--- a/src/plugins/generic/evdevkeyboard/CMakeLists.txt
+++ b/src/plugins/generic/evdevkeyboard/CMakeLists.txt
@@ -21,6 +21,5 @@ add_qt_plugin(qevdevkeyboardplugin
 
 #### Keys ignored in scope 1:.:.:evdevkeyboard.pro:<TRUE>:
 # OTHER_FILES = "evdevkeyboard.json"
-# PLUGIN_CLASS_NAME = "QEvdevKeyboardPlugin"
 # PLUGIN_EXTENDS = "-"
 # _LOADED = "qt_plugin"
diff --git a/src/plugins/generic/evdevmouse/CMakeLists.txt b/src/plugins/generic/evdevmouse/CMakeLists.txt
index abfa8d3665..339a538576 100644
--- a/src/plugins/generic/evdevmouse/CMakeLists.txt
+++ b/src/plugins/generic/evdevmouse/CMakeLists.txt
@@ -21,6 +21,5 @@ add_qt_plugin(qevdevmouseplugin
 
 #### Keys ignored in scope 1:.:.:evdevmouse.pro:<TRUE>:
 # OTHER_FILES = "evdevmouse.json"
-# PLUGIN_CLASS_NAME = "QEvdevMousePlugin"
 # PLUGIN_EXTENDS = "-"
 # _LOADED = "qt_plugin"
diff --git a/src/plugins/generic/evdevtablet/CMakeLists.txt b/src/plugins/generic/evdevtablet/CMakeLists.txt
index 4ba9317308..2898f00bde 100644
--- a/src/plugins/generic/evdevtablet/CMakeLists.txt
+++ b/src/plugins/generic/evdevtablet/CMakeLists.txt
@@ -21,6 +21,5 @@ add_qt_plugin(qevdevtabletplugin
 
 #### Keys ignored in scope 1:.:.:evdevtablet.pro:<TRUE>:
 # OTHER_FILES = "evdevtablet.json"
-# PLUGIN_CLASS_NAME = "QEvdevTabletPlugin"
 # PLUGIN_EXTENDS = "-"
 # _LOADED = "qt_plugin"
diff --git a/src/plugins/generic/evdevtouch/CMakeLists.txt b/src/plugins/generic/evdevtouch/CMakeLists.txt
index 560a3faded..ae0ec4ae4b 100644
--- a/src/plugins/generic/evdevtouch/CMakeLists.txt
+++ b/src/plugins/generic/evdevtouch/CMakeLists.txt
@@ -21,6 +21,5 @@ add_qt_plugin(qevdevtouchplugin
 
 #### Keys ignored in scope 1:.:.:evdevtouch.pro:<TRUE>:
 # OTHER_FILES = "evdevtouch.json"
-# PLUGIN_CLASS_NAME = "QEvdevTouchScreenPlugin"
 # PLUGIN_EXTENDS = "-"
 # _LOADED = "qt_plugin"
diff --git a/src/plugins/generic/libinput/CMakeLists.txt b/src/plugins/generic/libinput/CMakeLists.txt
index acc975a0c6..f44265c4d6 100644
--- a/src/plugins/generic/libinput/CMakeLists.txt
+++ b/src/plugins/generic/libinput/CMakeLists.txt
@@ -21,6 +21,5 @@ add_qt_plugin(qlibinputplugin
 
 #### Keys ignored in scope 1:.:.:libinput.pro:<TRUE>:
 # OTHER_FILES = "libinput.json"
-# PLUGIN_CLASS_NAME = "QLibInputPlugin"
 # PLUGIN_EXTENDS = "-"
 # _LOADED = "qt_plugin"
diff --git a/src/plugins/generic/tslib/.prev_CMakeLists.txt b/src/plugins/generic/tslib/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..12aa29bb00
--- /dev/null
+++ b/src/plugins/generic/tslib/.prev_CMakeLists.txt
@@ -0,0 +1,26 @@
+# Generated from tslib.pro.
+
+#####################################################################
+## qtslibplugin Plugin:
+#####################################################################
+
+add_qt_plugin(qtslibplugin
+    TYPE generic
+    CLASS_NAME QTsLibPlugin
+    SOURCES
+        main.cpp
+    LIBRARIES
+        Qt::CorePrivate
+        Qt::GuiPrivate
+        Qt::InputSupportPrivate
+    PUBLIC_LIBRARIES
+        PkgConfig::Tslib
+        Qt::Core
+        Qt::Gui
+        Qt::InputSupport
+)
+
+#### Keys ignored in scope 1:.:.:tslib.pro:<TRUE>:
+# OTHER_FILES = "tslib.json"
+# PLUGIN_EXTENDS = "-"
+# _LOADED = "qt_plugin"
diff --git a/src/plugins/generic/tslib/CMakeLists.txt b/src/plugins/generic/tslib/CMakeLists.txt
index 47d23528c1..714c8853f1 100644
--- a/src/plugins/generic/tslib/CMakeLists.txt
+++ b/src/plugins/generic/tslib/CMakeLists.txt
@@ -24,6 +24,5 @@ add_qt_plugin(qtslibplugin
 
 #### Keys ignored in scope 1:.:.:tslib.pro:<TRUE>:
 # OTHER_FILES = "tslib.json"
-# PLUGIN_CLASS_NAME = "QTsLibPlugin"
 # PLUGIN_EXTENDS = "-"
 # _LOADED = "qt_plugin"
diff --git a/src/plugins/generic/tuiotouch/CMakeLists.txt b/src/plugins/generic/tuiotouch/CMakeLists.txt
index 0907f571a9..ec0f03367e 100644
--- a/src/plugins/generic/tuiotouch/CMakeLists.txt
+++ b/src/plugins/generic/tuiotouch/CMakeLists.txt
@@ -27,6 +27,5 @@ add_qt_plugin(qtuiotouchplugin
 
 #### Keys ignored in scope 1:.:.:tuiotouch.pro:<TRUE>:
 # OTHER_FILES = "tuiotouch.json"
-# PLUGIN_CLASS_NAME = "QTuioTouchPlugin"
 # PLUGIN_EXTENDS = "-"
 # _LOADED = "qt_plugin"