Commit f3a90291 authored by Vlad Zahorodnii's avatar Vlad Zahorodnii
Browse files

wayland: Link statically KWindowSystem integration plugin

Without the KWindowSystem integration plugin, Wayland experience will be
negatively affected because windows created by kwin itself won't behave
as desired. Therefore it makes little sense to load this plugin at runtime.
parent 49e0b84d
...@@ -830,6 +830,7 @@ add_subdirectory(plugins) ...@@ -830,6 +830,7 @@ add_subdirectory(plugins)
target_link_libraries(kwin_wayland target_link_libraries(kwin_wayland
KWinQpaPlugin KWinQpaPlugin
KF5GlobalAccelPrivateKWin KF5GlobalAccelPrivateKWin
KF5WindowSystemKWinPrivatePlugin
) )
########### install files ############### ########### install files ###############
......
...@@ -34,6 +34,7 @@ target_link_libraries(KWinIntegrationTestFramework ...@@ -34,6 +34,7 @@ target_link_libraries(KWinIntegrationTestFramework
# Static plugins # Static plugins
KWinQpaPlugin KWinQpaPlugin
KF5GlobalAccelPrivateKWin KF5GlobalAccelPrivateKWin
KF5WindowSystemKWinPrivatePlugin
) )
function(integrationTest) function(integrationTest)
......
...@@ -32,6 +32,7 @@ ...@@ -32,6 +32,7 @@
Q_IMPORT_PLUGIN(KWinIntegrationPlugin) Q_IMPORT_PLUGIN(KWinIntegrationPlugin)
Q_IMPORT_PLUGIN(KGlobalAccelImpl) Q_IMPORT_PLUGIN(KGlobalAccelImpl)
Q_IMPORT_PLUGIN(KWindowSystemKWinPlugin)
namespace KWin namespace KWin
{ {
......
...@@ -62,6 +62,7 @@ ...@@ -62,6 +62,7 @@
Q_IMPORT_PLUGIN(KWinIntegrationPlugin) Q_IMPORT_PLUGIN(KWinIntegrationPlugin)
Q_IMPORT_PLUGIN(KGlobalAccelImpl) Q_IMPORT_PLUGIN(KGlobalAccelImpl)
Q_IMPORT_PLUGIN(KWindowSystemKWinPlugin)
namespace KWin namespace KWin
{ {
......
...@@ -5,13 +5,6 @@ set(kwindowsystem_plugin_SRCS ...@@ -5,13 +5,6 @@ set(kwindowsystem_plugin_SRCS
windowsystem.cpp windowsystem.cpp
) )
add_library(KF5WindowSystemKWinPrivatePlugin MODULE ${kwindowsystem_plugin_SRCS}) add_library(KF5WindowSystemKWinPrivatePlugin OBJECT ${kwindowsystem_plugin_SRCS})
set_target_properties(KF5WindowSystemKWinPrivatePlugin PROPERTIES LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin/kf5/kwindowsystem/") target_compile_definitions(KF5WindowSystemKWinPrivatePlugin PRIVATE QT_STATICPLUGIN)
target_link_libraries(KF5WindowSystemKWinPrivatePlugin kwin) target_link_libraries(KF5WindowSystemKWinPrivatePlugin kwin)
install(
TARGETS
KF5WindowSystemKWinPrivatePlugin
DESTINATION
${PLUGIN_INSTALL_DIR}/kf5/kwindowsystem/
)
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
class KWindowSystemKWinPlugin : public KWindowSystemPluginInterface class KWindowSystemKWinPlugin : public KWindowSystemPluginInterface
{ {
Q_OBJECT Q_OBJECT
Q_PLUGIN_METADATA(IID "org.kde.kwindowsystem.KWindowSystemPluginInterface" FILE "kwindowsystem.json") Q_PLUGIN_METADATA(IID KWindowSystemPluginInterface_iid FILE "kwindowsystem.json")
Q_INTERFACES(KWindowSystemPluginInterface) Q_INTERFACES(KWindowSystemPluginInterface)
public: public:
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment