From 749bb82ace7b3a00b6548a0d25a2aa396cd5337e Mon Sep 17 00:00:00 2001 From: Alexander Lohnau Date: Tue, 21 Mar 2023 07:49:02 +0100 Subject: [PATCH] Link to QtQml/QtQuick instead of KDeclarative targets We actually don'T need any of those classes --- CMakeLists.txt | 1 - quicksettings/flashlight/CMakeLists.txt | 19 +++++++++---------- quicksettings/nightcolor/CMakeLists.txt | 17 ++++++++--------- quicksettings/powermenu/CMakeLists.txt | 13 ++++++------- quicksettings/record/CMakeLists.txt | 19 +++++++++---------- quicksettings/screenrotation/CMakeLists.txt | 19 +++++++++---------- quicksettings/screenshot/CMakeLists.txt | 19 +++++++++---------- 7 files changed, 50 insertions(+), 57 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 409e6de2..45e29b55 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -65,7 +65,6 @@ find_package(KF6 ${KF6_MIN_VERSION} REQUIRED COMPONENTS ModemManagerQt NetworkManagerQt KCMUtils - Declarative Package ) diff --git a/quicksettings/flashlight/CMakeLists.txt b/quicksettings/flashlight/CMakeLists.txt index d8a9297e..aaa7bbb3 100644 --- a/quicksettings/flashlight/CMakeLists.txt +++ b/quicksettings/flashlight/CMakeLists.txt @@ -10,16 +10,15 @@ set(flashlightplugin_SRCS add_library(flashlightplugin ${flashlightplugin_SRCS}) target_link_libraries(flashlightplugin - PUBLIC - Qt::Core - PRIVATE - Qt::DBus - KF6::CoreAddons - KF6::QuickAddons - KF6::ConfigCore - KF6::ConfigGui - KF6::I18n - KF6::Notifications + Qt::Core + Qt::Qml + Qt::Quick + Qt::DBus + KF6::CoreAddons + KF6::ConfigCore + KF6::ConfigGui + KF6::I18n + KF6::Notifications ) set_property(TARGET flashlightplugin PROPERTY LIBRARY_OUTPUT_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/org/kde/plasma/quicksetting/flashlight) diff --git a/quicksettings/nightcolor/CMakeLists.txt b/quicksettings/nightcolor/CMakeLists.txt index cd0a3be4..46ad9f4d 100644 --- a/quicksettings/nightcolor/CMakeLists.txt +++ b/quicksettings/nightcolor/CMakeLists.txt @@ -16,15 +16,14 @@ kconfig_add_kcfg_files(nightcolorplugin_SRCS nightcolorsettings.kcfgc GENERATE_M add_library(nightcolorplugin ${nightcolorplugin_SRCS}) target_link_libraries(nightcolorplugin - PUBLIC - Qt::Core - PRIVATE - Qt::DBus - KF6::CoreAddons - KF6::QuickAddons - KF6::ConfigCore - KF6::ConfigGui - ) + Qt::Core + Qt::DBus + Qt::Qml + Qt::Quick + KF6::CoreAddons + KF6::ConfigCore + KF6::ConfigGui +) set_property(TARGET nightcolorplugin PROPERTY LIBRARY_OUTPUT_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/org/kde/plasma/quicksetting/nightcolor) file(COPY qmldir DESTINATION ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/org/kde/plasma/quicksetting/nightcolor) diff --git a/quicksettings/powermenu/CMakeLists.txt b/quicksettings/powermenu/CMakeLists.txt index cc5b36dd..ecd64bba 100644 --- a/quicksettings/powermenu/CMakeLists.txt +++ b/quicksettings/powermenu/CMakeLists.txt @@ -11,13 +11,12 @@ add_library(powermenuplugin ${powermenuplugin_SRCS}) find_package(LibKWorkspace) target_link_libraries(powermenuplugin - PUBLIC - Qt::Core - PRIVATE - KF6::CoreAddons - KF6::QuickAddons - PW::KWorkspace - ) + Qt::Core + Qt::Qml + Qt::Quick + KF6::CoreAddons + PW::KWorkspace +) set_property(TARGET powermenuplugin PROPERTY LIBRARY_OUTPUT_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/org/kde/plasma/quicksetting/powermenu) file(COPY qmldir DESTINATION ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/org/kde/plasma/quicksetting/powermenu) diff --git a/quicksettings/record/CMakeLists.txt b/quicksettings/record/CMakeLists.txt index a23c6965..c64c8f4b 100644 --- a/quicksettings/record/CMakeLists.txt +++ b/quicksettings/record/CMakeLists.txt @@ -9,16 +9,15 @@ set(recordplugin_SRCS add_library(recordplugin ${recordplugin_SRCS}) target_link_libraries(recordplugin - PUBLIC - Qt::Core - PRIVATE - Qt::DBus - KF6::CoreAddons - KF6::QuickAddons - KF6::ConfigCore - KF6::ConfigGui - KF6::I18n - KF6::Notifications + Qt::Core + Qt::DBus + Qt::Qml + Qt::Quick + KF6::CoreAddons + KF6::ConfigCore + KF6::ConfigGui + KF6::I18n + KF6::Notifications ) set_property(TARGET recordplugin PROPERTY LIBRARY_OUTPUT_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/org/kde/plasma/quicksetting/record) diff --git a/quicksettings/screenrotation/CMakeLists.txt b/quicksettings/screenrotation/CMakeLists.txt index b33188e9..64b3e297 100644 --- a/quicksettings/screenrotation/CMakeLists.txt +++ b/quicksettings/screenrotation/CMakeLists.txt @@ -12,16 +12,15 @@ set(screenrotationplugin_SRCS add_library(screenrotationplugin ${screenrotationplugin_SRCS}) target_link_libraries(screenrotationplugin - PUBLIC - Qt::Core - PRIVATE - Qt::DBus - KF6::CoreAddons - KF6::QuickAddons - KF6::ConfigCore - KF6::ConfigGui - KF6::I18n - KF6::Notifications + Qt::Core + Qt::Qml + Qt::Quick + Qt::DBus + KF6::CoreAddons + KF6::ConfigCore + KF6::ConfigGui + KF6::I18n + KF6::Notifications ) set_property(TARGET screenrotationplugin PROPERTY LIBRARY_OUTPUT_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/org/kde/plasma/quicksetting/screenrotation) diff --git a/quicksettings/screenshot/CMakeLists.txt b/quicksettings/screenshot/CMakeLists.txt index c0a21452..4ed16ef4 100644 --- a/quicksettings/screenshot/CMakeLists.txt +++ b/quicksettings/screenshot/CMakeLists.txt @@ -12,16 +12,15 @@ set(screenshotplugin_SRCS add_library(screenshotplugin ${screenshotplugin_SRCS}) target_link_libraries(screenshotplugin - PUBLIC - Qt::Core - PRIVATE - Qt::DBus - KF6::CoreAddons - KF6::QuickAddons - KF6::ConfigCore - KF6::ConfigGui - KF6::I18n - KF6::Notifications + Qt::Core + Qt::Qml + Qt::Quick + Qt::DBus + KF6::CoreAddons + KF6::ConfigCore + KF6::ConfigGui + KF6::I18n + KF6::Notifications ) set_property(TARGET screenshotplugin PROPERTY LIBRARY_OUTPUT_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/org/kde/plasma/quicksetting/screenshot)