diff --git a/.github/workflows/debian12.yml b/.github/workflows/debian12.yml index def537e..be68082 100644 --- a/.github/workflows/debian12.yml +++ b/.github/workflows/debian12.yml @@ -34,7 +34,7 @@ jobs: continue-on-error: true - name: Install Dependencies - run: apt -y install cmake g++ gettext extra-cmake-modules qttools5-dev libkf5configwidgets-dev libkf5globalaccel-dev libkf5notifications-dev kwin-dev + run: apt -y install cmake g++ gettext extra-cmake-modules qttools5-dev libkf5configwidgets-dev kwin-dev - name: Configure CMake # Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make. diff --git a/.github/workflows/kubuntu2204-backports.yml b/.github/workflows/kubuntu2204-backports.yml index 820cdc1..4813c0c 100644 --- a/.github/workflows/kubuntu2204-backports.yml +++ b/.github/workflows/kubuntu2204-backports.yml @@ -39,7 +39,7 @@ jobs: run: sudo add-apt-repository -y ppa:kubuntu-ppa/backports-extra - name: Install Dependencies - run: sudo apt install -y gettext extra-cmake-modules qttools5-dev libkf5configwidgets-dev libkf5globalaccel-dev libkf5notifications-dev kwin-dev + run: sudo apt install -y gettext extra-cmake-modules qttools5-dev libkf5configwidgets-dev kwin-dev - name: Configure CMake # Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make. diff --git a/.github/workflows/neon.yml b/.github/workflows/neon.yml index 370b6f0..da5347e 100644 --- a/.github/workflows/neon.yml +++ b/.github/workflows/neon.yml @@ -34,7 +34,7 @@ jobs: continue-on-error: true - name: Install Dependencies - run: apt -y install cmake g++ gettext extra-cmake-modules qttools5-dev libkf5configwidgets-dev libkf5globalaccel-dev libkf5notifications-dev kwin-dev + run: apt -y install cmake g++ gettext extra-cmake-modules qttools5-dev libkf5configwidgets-dev kwin-dev - name: Configure CMake # Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make. diff --git a/CMakeLists.txt b/CMakeLists.txt index b151ae6..66ec99b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -31,22 +31,9 @@ include(KDEInstallDirs) include(KDECMakeSettings) include(KDECompilerSettings NO_POLICY_SCOPE) -find_package(Qt${QT_VERSION_MAJOR} ${QT_MIN_VERSION} REQUIRED COMPONENTS - Core - Gui - DBus - Widgets - OpenGL - Network - Xml -) - # required frameworks by Core find_package(KF${QT_VERSION_MAJOR} ${KF_MIN_VERSION} REQUIRED COMPONENTS - Config ConfigWidgets - CoreAddons - GlobalAccel ) if(${QT_VERSION_MAJOR} EQUAL 6) find_package(KF${QT_VERSION_MAJOR} ${KF_MIN_VERSION} REQUIRED COMPONENTS diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index f1cfed6..4da8151 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -13,13 +13,8 @@ kcoreaddons_add_plugin(kwin4_effect_shapecorners INSTALL_NAMESPACE "kwin/effects target_sources(kwin4_effect_shapecorners PRIVATE ${effect_SRCS}) target_link_libraries(kwin4_effect_shapecorners - Qt${QT_VERSION_MAJOR}::Core - Qt${QT_VERSION_MAJOR}::Gui Qt${QT_VERSION_MAJOR}::DBus - epoxy::epoxy - KF${QT_VERSION_MAJOR}::ConfigCore KF${QT_VERSION_MAJOR}::ConfigGui - KF${QT_VERSION_MAJOR}::CoreAddons ) if(${QT_VERSION_MAJOR} EQUAL 6) target_link_libraries(kwin4_effect_shapecorners diff --git a/src/kcm/CMakeLists.txt b/src/kcm/CMakeLists.txt index 3b4c95f..816f166 100644 --- a/src/kcm/CMakeLists.txt +++ b/src/kcm/CMakeLists.txt @@ -22,10 +22,6 @@ else() endif () target_link_libraries(kwin_shapecorners_config - Qt${QT_VERSION_MAJOR}::Core Qt${QT_VERSION_MAJOR}::DBus - Qt${QT_VERSION_MAJOR}::Gui KF${QT_VERSION_MAJOR}::ConfigWidgets - KF${QT_VERSION_MAJOR}::ConfigGui - KF${QT_VERSION_MAJOR}::GlobalAccel ) \ No newline at end of file