From 416c2c64b1885c2022a40f0caefcf26d99c8b9a5 Mon Sep 17 00:00:00 2001 From: Vlad Zahorodnii Date: Wed, 25 Oct 2023 01:00:16 +0300 Subject: [PATCH] Link Qt::Concurrent with libkwin privately --- src/CMakeLists.txt | 2 +- src/KWinConfig.cmake.in | 1 - src/plugins/qpa/CMakeLists.txt | 1 + src/xwayland/CMakeLists.txt | 2 +- 4 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 4be92fa31c..25fd953ee8 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -202,7 +202,6 @@ target_link_libraries(kwin kwineffects kwinglutils - Qt::Concurrent Qt::DBus Qt::Quick Qt::Widgets @@ -210,6 +209,7 @@ target_link_libraries(kwin PRIVATE + Qt::Concurrent Qt::Sensors KF6::ConfigCore diff --git a/src/KWinConfig.cmake.in b/src/KWinConfig.cmake.in index 45f1b132b7..a1d215e63e 100644 --- a/src/KWinConfig.cmake.in +++ b/src/KWinConfig.cmake.in @@ -3,7 +3,6 @@ include(CMakeFindDependencyMacro) find_dependency(Qt6Core "@QT_MIN_VERSION@") find_dependency(Qt6Gui "@QT_MIN_VERSION@") -find_dependency(Qt6Concurrent "@QT_MIN_VERSION@") find_dependency(Qt6Quick "@QT_MIN_VERSION@") find_dependency(KWinEffects) diff --git a/src/plugins/qpa/CMakeLists.txt b/src/plugins/qpa/CMakeLists.txt index ca9bb3233e..e1f5dc2793 100644 --- a/src/plugins/qpa/CMakeLists.txt +++ b/src/plugins/qpa/CMakeLists.txt @@ -22,6 +22,7 @@ ecm_qt_declare_logging_category(KWinQpaPlugin target_compile_definitions(KWinQpaPlugin PRIVATE QT_STATICPLUGIN) target_link_libraries(KWinQpaPlugin PRIVATE + Qt::Concurrent Qt::CorePrivate Qt::GuiPrivate Freetype::Freetype # Must be after Qt6 platform support libs diff --git a/src/xwayland/CMakeLists.txt b/src/xwayland/CMakeLists.txt index 512aa5d922..9e51bf1295 100644 --- a/src/xwayland/CMakeLists.txt +++ b/src/xwayland/CMakeLists.txt @@ -16,7 +16,7 @@ add_library(KWinXwaylandServerModule OBJECT xwldrophandler.cpp xwaylandlauncher.cpp ) -target_link_libraries(KWinXwaylandServerModule PUBLIC kwin KF6::I18n KWinXwaylandCommon XCB::XCB XCB::RANDR XCB::XFIXES XCB::COMPOSITE XKB::XKB) +target_link_libraries(KWinXwaylandServerModule PUBLIC kwin Qt::Concurrent KF6::I18n KWinXwaylandCommon XCB::XCB XCB::RANDR XCB::XFIXES XCB::COMPOSITE XKB::XKB) if(TARGET KF6::Notifications) target_link_libraries(KWinXwaylandServerModule PUBLIC KF6::Notifications) endif()