From 70393eec6f55ee4f6c452b94eba305b7b31a9617 Mon Sep 17 00:00:00 2001
From: Vlad Zahorodnii <vlad.zahorodnii@kde.org>
Date: Sat, 21 Nov 2020 14:41:16 +0200
Subject: [PATCH] Consistently name some KF5 integration plugins

---
 CMakeLists.txt                       | 6 +++---
 autotests/integration/CMakeLists.txt | 6 +++---
 plugins/idletime/CMakeLists.txt      | 6 +++---
 plugins/kglobalaccel/CMakeLists.txt  | 6 +++---
 plugins/windowsystem/CMakeLists.txt  | 6 +++---
 5 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 867deaf41e..c8d1b354e2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -829,9 +829,9 @@ add_subdirectory(plugins)
 
 target_link_libraries(kwin_wayland
     KWinQpaPlugin
-    KF5GlobalAccelPrivateKWin
-    KF5WindowSystemKWinPrivatePlugin
-    KF5IdleTimeKWinWaylandPrivatePlugin
+    KF5GlobalAccelKWinPlugin
+    KF5WindowSystemKWinPlugin
+    KF5IdleTimeKWinPlugin
 )
 
 ########### install files ###############
diff --git a/autotests/integration/CMakeLists.txt b/autotests/integration/CMakeLists.txt
index 68f67338ee..3fa74aad72 100644
--- a/autotests/integration/CMakeLists.txt
+++ b/autotests/integration/CMakeLists.txt
@@ -33,9 +33,9 @@ target_link_libraries(KWinIntegrationTestFramework
 
     # Static plugins
     KWinQpaPlugin
-    KF5GlobalAccelPrivateKWin
-    KF5WindowSystemKWinPrivatePlugin
-    KF5IdleTimeKWinWaylandPrivatePlugin
+    KF5GlobalAccelKWinPlugin
+    KF5WindowSystemKWinPlugin
+    KF5IdleTimeKWinPlugin
 )
 
 function(integrationTest)
diff --git a/plugins/idletime/CMakeLists.txt b/plugins/idletime/CMakeLists.txt
index 792e4aeb54..dd78f2800d 100644
--- a/plugins/idletime/CMakeLists.txt
+++ b/plugins/idletime/CMakeLists.txt
@@ -2,6 +2,6 @@ set(idletime_plugin_SRCS
     poller.cpp
 )
 
-add_library(KF5IdleTimeKWinWaylandPrivatePlugin OBJECT ${idletime_plugin_SRCS})
-target_compile_definitions(KF5IdleTimeKWinWaylandPrivatePlugin PRIVATE QT_STATICPLUGIN)
-target_link_libraries(KF5IdleTimeKWinWaylandPrivatePlugin KF5::IdleTime KF5::WaylandClient kwin)
+add_library(KF5IdleTimeKWinPlugin OBJECT ${idletime_plugin_SRCS})
+target_compile_definitions(KF5IdleTimeKWinPlugin PRIVATE QT_STATICPLUGIN)
+target_link_libraries(KF5IdleTimeKWinPlugin KF5::IdleTime KF5::WaylandClient kwin)
diff --git a/plugins/kglobalaccel/CMakeLists.txt b/plugins/kglobalaccel/CMakeLists.txt
index 656f14c591..230aa7d602 100644
--- a/plugins/kglobalaccel/CMakeLists.txt
+++ b/plugins/kglobalaccel/CMakeLists.txt
@@ -2,6 +2,6 @@ set(kglobalaccel_plugin_SRCS
     kglobalaccel_plugin.cpp
 )
 
-add_library(KF5GlobalAccelPrivateKWin OBJECT ${kglobalaccel_plugin_SRCS})
-target_compile_definitions(KF5GlobalAccelPrivateKWin PRIVATE QT_STATICPLUGIN)
-target_link_libraries(KF5GlobalAccelPrivateKWin KF5::GlobalAccelPrivate kwin)
+add_library(KF5GlobalAccelKWinPlugin OBJECT ${kglobalaccel_plugin_SRCS})
+target_compile_definitions(KF5GlobalAccelKWinPlugin PRIVATE QT_STATICPLUGIN)
+target_link_libraries(KF5GlobalAccelKWinPlugin KF5::GlobalAccelPrivate kwin)
diff --git a/plugins/windowsystem/CMakeLists.txt b/plugins/windowsystem/CMakeLists.txt
index 423aae3c5f..c3c59086e7 100644
--- a/plugins/windowsystem/CMakeLists.txt
+++ b/plugins/windowsystem/CMakeLists.txt
@@ -5,6 +5,6 @@ set(kwindowsystem_plugin_SRCS
     windowsystem.cpp
 )
 
-add_library(KF5WindowSystemKWinPrivatePlugin OBJECT ${kwindowsystem_plugin_SRCS})
-target_compile_definitions(KF5WindowSystemKWinPrivatePlugin PRIVATE QT_STATICPLUGIN)
-target_link_libraries(KF5WindowSystemKWinPrivatePlugin kwin)
+add_library(KF5WindowSystemKWinPlugin OBJECT ${kwindowsystem_plugin_SRCS})
+target_compile_definitions(KF5WindowSystemKWinPlugin PRIVATE QT_STATICPLUGIN)
+target_link_libraries(KF5WindowSystemKWinPlugin kwin)