8 files changed, 23 insertions, 38 deletions
diff --git a/src/plugins/generic/evdevkeyboard/CMakeLists.txt b/src/plugins/generic/evdevkeyboard/CMakeLists.txt
index 735d01de40..86f5c36124 100644
--- a/src/plugins/generic/evdevkeyboard/CMakeLists.txt
+++ b/src/plugins/generic/evdevkeyboard/CMakeLists.txt
@@ -9,14 +9,12 @@ qt_add_plugin(QEvdevKeyboardPlugin
     TYPE generic
     SOURCES
         main.cpp
-    LIBRARIES
-        Qt::CorePrivate
-        Qt::GuiPrivate
-        Qt::InputSupportPrivate
     PUBLIC_LIBRARIES
         Qt::Core
+        Qt::CorePrivate
         Qt::Gui
-        Qt::InputSupport
+        Qt::GuiPrivate
+        Qt::InputSupportPrivate
 )
 
 #### Keys ignored in scope 1:.:.:evdevkeyboard.pro:<TRUE>:
diff --git a/src/plugins/generic/evdevmouse/CMakeLists.txt b/src/plugins/generic/evdevmouse/CMakeLists.txt
index 328d815cdf..2ed6c1b6d4 100644
--- a/src/plugins/generic/evdevmouse/CMakeLists.txt
+++ b/src/plugins/generic/evdevmouse/CMakeLists.txt
@@ -9,14 +9,12 @@ qt_add_plugin(QEvdevMousePlugin
     TYPE generic
     SOURCES
         main.cpp
-    LIBRARIES
-        Qt::CorePrivate
-        Qt::GuiPrivate
-        Qt::InputSupportPrivate
     PUBLIC_LIBRARIES
         Qt::Core
+        Qt::CorePrivate
         Qt::Gui
-        Qt::InputSupport
+        Qt::GuiPrivate
+        Qt::InputSupportPrivate
 )
 
 #### Keys ignored in scope 1:.:.:evdevmouse.pro:<TRUE>:
diff --git a/src/plugins/generic/evdevtablet/CMakeLists.txt b/src/plugins/generic/evdevtablet/CMakeLists.txt
index e7d6fbb527..93dd10a0e1 100644
--- a/src/plugins/generic/evdevtablet/CMakeLists.txt
+++ b/src/plugins/generic/evdevtablet/CMakeLists.txt
@@ -9,14 +9,12 @@ qt_add_plugin(QEvdevTabletPlugin
     TYPE generic
     SOURCES
         main.cpp
-    LIBRARIES
-        Qt::CorePrivate
-        Qt::GuiPrivate
-        Qt::InputSupportPrivate
     PUBLIC_LIBRARIES
         Qt::Core
+        Qt::CorePrivate
         Qt::Gui
-        Qt::InputSupport
+        Qt::GuiPrivate
+        Qt::InputSupportPrivate
 )
 
 #### Keys ignored in scope 1:.:.:evdevtablet.pro:<TRUE>:
diff --git a/src/plugins/generic/evdevtouch/CMakeLists.txt b/src/plugins/generic/evdevtouch/CMakeLists.txt
index b6c2131f33..e4a4d40c2a 100644
--- a/src/plugins/generic/evdevtouch/CMakeLists.txt
+++ b/src/plugins/generic/evdevtouch/CMakeLists.txt
@@ -9,14 +9,12 @@ qt_add_plugin(QEvdevTouchScreenPlugin
     TYPE generic
     SOURCES
         main.cpp
-    LIBRARIES
-        Qt::CorePrivate
-        Qt::GuiPrivate
-        Qt::InputSupportPrivate
     PUBLIC_LIBRARIES
         Qt::Core
+        Qt::CorePrivate
         Qt::Gui
-        Qt::InputSupport
+        Qt::GuiPrivate
+        Qt::InputSupportPrivate
 )
 
 #### Keys ignored in scope 1:.:.:evdevtouch.pro:<TRUE>:
diff --git a/src/plugins/generic/libinput/CMakeLists.txt b/src/plugins/generic/libinput/CMakeLists.txt
index 30fa36aa85..b772623307 100644
--- a/src/plugins/generic/libinput/CMakeLists.txt
+++ b/src/plugins/generic/libinput/CMakeLists.txt
@@ -9,14 +9,12 @@ qt_add_plugin(QLibInputPlugin
     TYPE generic
     SOURCES
         main.cpp
-    LIBRARIES
-        Qt::CorePrivate
-        Qt::GuiPrivate
-        Qt::InputSupportPrivate
     PUBLIC_LIBRARIES
         Qt::Core
+        Qt::CorePrivate
         Qt::Gui
-        Qt::InputSupport
+        Qt::GuiPrivate
+        Qt::InputSupportPrivate
 )
 
 #### Keys ignored in scope 1:.:.:libinput.pro:<TRUE>:
diff --git a/src/plugins/generic/tslib/.prev_CMakeLists.txt b/src/plugins/generic/tslib/.prev_CMakeLists.txt
index 83ca4f264b..3e82a077c3 100644
--- a/src/plugins/generic/tslib/.prev_CMakeLists.txt
+++ b/src/plugins/generic/tslib/.prev_CMakeLists.txt
@@ -9,15 +9,13 @@ qt_add_plugin(QTsLibPlugin
     TYPE generic
     SOURCES
         main.cpp
-    LIBRARIES
-        Qt::CorePrivate
-        Qt::GuiPrivate
-        Qt::InputSupportPrivate
     PUBLIC_LIBRARIES
         PkgConfig::Tslib
         Qt::Core
+        Qt::CorePrivate
         Qt::Gui
-        Qt::InputSupport
+        Qt::GuiPrivate
+        Qt::InputSupportPrivate
 )
 
 #### Keys ignored in scope 1:.:.:tslib.pro:<TRUE>:
diff --git a/src/plugins/generic/tslib/CMakeLists.txt b/src/plugins/generic/tslib/CMakeLists.txt
index 54afe0cbe7..964e322a55 100644
--- a/src/plugins/generic/tslib/CMakeLists.txt
+++ b/src/plugins/generic/tslib/CMakeLists.txt
@@ -11,15 +11,13 @@ qt_add_plugin(QTsLibPlugin
     TYPE generic
     SOURCES
         main.cpp
-    LIBRARIES
-        Qt::CorePrivate
-        Qt::GuiPrivate
-        Qt::InputSupportPrivate
     PUBLIC_LIBRARIES
         PkgConfig::Tslib
         Qt::Core
+        Qt::CorePrivate
         Qt::Gui
-        Qt::InputSupport
+        Qt::GuiPrivate
+        Qt::InputSupportPrivate
 )
 
 #### Keys ignored in scope 1:.:.:tslib.pro:<TRUE>:
diff --git a/src/plugins/generic/tuiotouch/CMakeLists.txt b/src/plugins/generic/tuiotouch/CMakeLists.txt
index d17b6dae3a..82db49d4c3 100644
--- a/src/plugins/generic/tuiotouch/CMakeLists.txt
+++ b/src/plugins/generic/tuiotouch/CMakeLists.txt
@@ -16,12 +16,11 @@ qt_add_plugin(QTuioTouchPlugin
         qtuiotoken_p.h
     DEFINES
         QT_NO_FOREACH
-    LIBRARIES
-        Qt::CorePrivate
-        Qt::GuiPrivate
     PUBLIC_LIBRARIES
         Qt::Core
+        Qt::CorePrivate
         Qt::Gui
+        Qt::GuiPrivate
         Qt::Network
 )