diff --git a/.github/workflows/debian12.yml b/.github/workflows/debian12.yml
index 73a2fd3..def537e 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 libqt5x11extras5-dev libkf5configwidgets-dev libkf5globalaccel-dev libkf5notifications-dev kwin-dev
+ run: apt -y install cmake g++ gettext extra-cmake-modules qttools5-dev libkf5configwidgets-dev libkf5globalaccel-dev libkf5notifications-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 c3acfae..820cdc1 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 libqt5x11extras5-dev libkf5configwidgets-dev libkf5globalaccel-dev libkf5notifications-dev kwin-dev
+ run: sudo apt install -y gettext extra-cmake-modules qttools5-dev libkf5configwidgets-dev libkf5globalaccel-dev libkf5notifications-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 f84cecd..370b6f0 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 libqt5x11extras5-dev libkf5configwidgets-dev libkf5globalaccel-dev libkf5notifications-dev kwin-dev
+ run: apt -y install cmake g++ gettext extra-cmake-modules qttools5-dev libkf5configwidgets-dev libkf5globalaccel-dev libkf5notifications-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 76b90f4..b151ae6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -47,7 +47,6 @@ find_package(KF${QT_VERSION_MAJOR} ${KF_MIN_VERSION} REQUIRED COMPONENTS
ConfigWidgets
CoreAddons
GlobalAccel
- WindowSystem
)
if(${QT_VERSION_MAJOR} EQUAL 6)
find_package(KF${QT_VERSION_MAJOR} ${KF_MIN_VERSION} REQUIRED COMPONENTS
diff --git a/README.md b/README.md
index d1d0cf1..9c12b08 100644
--- a/README.md
+++ b/README.md
@@ -41,7 +41,7 @@ You need to install development packages for your distribution first:
- Plasma 5 - by [alex47](https://github.com/alex47):
```
- sudo apt install git cmake g++ gettext extra-cmake-modules qttools5-dev libqt5x11extras5-dev libkf5configwidgets-dev libkf5globalaccel-dev libkf5notifications-dev kwin-dev
+ sudo apt install git cmake g++ gettext extra-cmake-modules qttools5-dev libkf5configwidgets-dev libkf5globalaccel-dev libkf5notifications-dev kwin-dev
```
- Plasma 6
```
@@ -52,7 +52,7 @@ You need to install development packages for your distribution first:
Fedora
```
- sudo dnf install git cmake gcc-c++ extra-cmake-modules qt5-qttools-devel qt5-qttools-static qt5-qtx11extras-devel kf5-kconfigwidgets-devel kf5-kcrash-devel kf5-kguiaddons-devel kf5-kglobalaccel-devel kf5-kio-devel kf5-ki18n-devel kwin-devel qt5-qtbase-devel libepoxy-devel
+ sudo dnf install git cmake gcc-c++ extra-cmake-modules qt5-qttools-devel qt5-qttools-static kf5-kconfigwidgets-devel kf5-kcrash-devel kf5-kguiaddons-devel kf5-kglobalaccel-devel kf5-kio-devel kf5-ki18n-devel kwin-devel qt5-qtbase-devel libepoxy-devel
```
@@ -71,14 +71,14 @@ You need to install development packages for your distribution first:
OpenSUSE - by https://github.com/mathiasgredal and https://github.com/Richardsause
```
- sudo zypper install git cmake gcc-c++ extra-cmake-modules libqt5-qttools-devel libqt5-qtx11extras-devel kconfigwidgets-devel kguiaddons-devel kglobalaccel-devel ki18n-devel knotifications-devel kwin5-devel libQt5Gui-devel libQt5OpenGL-devel libepoxy-devel kwindowsystem-devel libqt5-qtnetworkauth-devel
+ sudo zypper install git cmake gcc-c++ extra-cmake-modules libqt5-qttools-devel kconfigwidgets-devel kguiaddons-devel kglobalaccel-devel ki18n-devel knotifications-devel kwin5-devel libQt5Gui-devel libQt5OpenGL-devel libepoxy-devel kwindowsystem-devel libqt5-qtnetworkauth-devel
```
Void - by https://github.com/lay-by
```
- xbps-install git cmake make qt5-tools-devel extra-cmake-modules qt5-x11extras-devel gettext-devel kwin-devel
+ xbps-install git cmake make qt5-tools-devel extra-cmake-modules gettext-devel kwin-devel
```
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 8b5f6f2..f1cfed6 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -20,7 +20,6 @@ target_link_libraries(kwin4_effect_shapecorners
KF${QT_VERSION_MAJOR}::ConfigCore
KF${QT_VERSION_MAJOR}::ConfigGui
KF${QT_VERSION_MAJOR}::CoreAddons
- KF${QT_VERSION_MAJOR}::WindowSystem
)
if(${QT_VERSION_MAJOR} EQUAL 6)
target_link_libraries(kwin4_effect_shapecorners
diff --git a/src/ShapeCornersEffect.cpp b/src/ShapeCornersEffect.cpp
index 404b556..af02c8a 100644
--- a/src/ShapeCornersEffect.cpp
+++ b/src/ShapeCornersEffect.cpp
@@ -30,12 +30,6 @@
#include
#endif
-#if KWIN_EFFECT_API_VERSION >= 235
- #include
-#else
- #include
-#endif
-
ShapeCornersEffect::ShapeCornersEffect()
#if KWIN_EFFECT_API_VERSION >= 236
: KWin::OffscreenEffect()
@@ -61,14 +55,8 @@ ShapeCornersEffect::ShapeCornersEffect()
}
if(m_shaderManager.IsValid()) {
-#if KWIN_EFFECT_API_VERSION >= 235
- const auto& windowList = KX11Extras::windows();
-#else
- const auto& windowList = KWindowSystem::windows();
-#endif
- for (const auto& id: windowList)
- if (const auto win = KWin::effects->findWindow(id))
- windowAdded(win);
+ for (const auto& win: KWin::effects->stackingOrder())
+ windowAdded(win);
connect(KWin::effects, &KWin::EffectsHandler::windowAdded, this, &ShapeCornersEffect::windowAdded);
connect(KWin::effects, &KWin::EffectsHandler::windowDeleted, this, &ShapeCornersEffect::windowRemoved);
}
diff --git a/src/kcm/CMakeLists.txt b/src/kcm/CMakeLists.txt
index 62b4fc1..3b4c95f 100644
--- a/src/kcm/CMakeLists.txt
+++ b/src/kcm/CMakeLists.txt
@@ -28,5 +28,4 @@ target_link_libraries(kwin_shapecorners_config
KF${QT_VERSION_MAJOR}::ConfigWidgets
KF${QT_VERSION_MAJOR}::ConfigGui
KF${QT_VERSION_MAJOR}::GlobalAccel
- KF${QT_VERSION_MAJOR}::WindowSystem
)
\ No newline at end of file