wayland: Link statically KGlobalAccel integration plugin

Without the KGlobalAccel integration plugin, Wayland experience will be
negatively affected. Therefore it makes little sense to load it at run-
time.

CMakeLists.txt

@@ -826,7 +826,11 @@ endif()
 
 add_subdirectory(platformsupport)
 add_subdirectory(plugins)
-target_link_libraries(kwin_wayland KWinQpaPlugin)
+
+target_link_libraries(kwin_wayland
+    KWinQpaPlugin
+    KF5GlobalAccelPrivateKWin
+)
 
 ########### install files ###############
 

autotests/integration/CMakeLists.txt

@@ -26,7 +26,15 @@ ecm_add_qtwayland_client_protocol(KWinIntegrationTestFramework_SOURCES
     BASENAME xdg-shell
 )
 add_library(KWinIntegrationTestFramework STATIC ${KWinIntegrationTestFramework_SOURCES})
-target_link_libraries(KWinIntegrationTestFramework kwin Qt5::Test Wayland::Client KWinQpaPlugin)
+target_link_libraries(KWinIntegrationTestFramework
+    Qt5::Test
+    kwin
+    Wayland::Client
+
+    # Static plugins
+    KWinQpaPlugin
+    KF5GlobalAccelPrivateKWin
+)
 
 function(integrationTest)
     set(optionArgs WAYLAND_ONLY)

autotests/integration/kwin_wayland_test.cpp

@@ -31,6 +31,7 @@
 #include <iostream>
 
 Q_IMPORT_PLUGIN(KWinIntegrationPlugin)
+Q_IMPORT_PLUGIN(KGlobalAccelImpl)
 
 namespace KWin
 {

main_wayland.cpp

@@ -61,6 +61,7 @@
 #include <iomanip>
 
 Q_IMPORT_PLUGIN(KWinIntegrationPlugin)
+Q_IMPORT_PLUGIN(KGlobalAccelImpl)
 
 namespace KWin
 {

plugins/kglobalaccel/CMakeLists.txt

@@ -2,16 +2,6 @@ set(kglobalaccel_plugin_SRCS
     kglobalaccel_plugin.cpp
 )
 
-add_library(KF5GlobalAccelPrivateKWin MODULE ${kglobalaccel_plugin_SRCS})
-set_target_properties(KF5GlobalAccelPrivateKWin PROPERTIES LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin/org.kde.kglobalaccel5.platforms/")
-target_link_libraries(KF5GlobalAccelPrivateKWin
-    KF5::GlobalAccelPrivate
-    kwin
-)
-
-install(
-    TARGETS
-        KF5GlobalAccelPrivateKWin
-    DESTINATION
-        ${PLUGIN_INSTALL_DIR}/org.kde.kglobalaccel5.platforms/
-)
+add_library(KF5GlobalAccelPrivateKWin OBJECT ${kglobalaccel_plugin_SRCS})
+target_compile_definitions(KF5GlobalAccelPrivateKWin PRIVATE QT_STATICPLUGIN)
+target_link_libraries(KF5GlobalAccelPrivateKWin KF5::GlobalAccelPrivate kwin)

plugins/kglobalaccel/kglobalaccel_plugin.h

@@ -16,7 +16,7 @@
 class KGlobalAccelImpl : public KGlobalAccelInterface
 {
     Q_OBJECT
-    Q_PLUGIN_METADATA(IID "org.kde.kglobalaccel5.KGlobalAccelInterface" FILE "kwin.json")
+    Q_PLUGIN_METADATA(IID KGlobalAccelInterface_iid FILE "kwin.json")
     Q_INTERFACES(KGlobalAccelInterface)
 
 public: