From 5cf2e1e84d41a36c68699eae40976ba82f29bf5a Mon Sep 17 00:00:00 2001
From: Marco Martin <notmart@gmail.com>
Date: Mon, 4 Apr 2022 14:37:34 +0200
Subject: [PATCH] Rebase and adapt to changes in master

---
 src/effects/CMakeLists.txt             |  1 -
 src/effects/private/qml/WindowHeap.qml |  1 +
 src/effects/windowview/CMakeLists.txt  | 10 ++++++++++
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/effects/CMakeLists.txt b/src/effects/CMakeLists.txt
index 504a1838c8..d4d1ce996f 100644
--- a/src/effects/CMakeLists.txt
+++ b/src/effects/CMakeLists.txt
@@ -86,7 +86,6 @@ add_subdirectory(slideback)
 add_subdirectory(slidingpopups)
 add_subdirectory(thumbnailaside)
 add_subdirectory(touchpoints)
-add_subdirectory(windowgeometry)
 add_subdirectory(windowview)
 add_subdirectory(zoom)
 
diff --git a/src/effects/private/qml/WindowHeap.qml b/src/effects/private/qml/WindowHeap.qml
index 763790dbf2..7c3ef0aae0 100644
--- a/src/effects/private/qml/WindowHeap.qml
+++ b/src/effects/private/qml/WindowHeap.qml
@@ -247,6 +247,7 @@ FocusScope {
                         PropertyChanges {
                             target: closeButton
                             opacity: 1
+                        }
                     },
                     State {
                         name: "active-hidden"
diff --git a/src/effects/windowview/CMakeLists.txt b/src/effects/windowview/CMakeLists.txt
index d32b448c02..5eede6a27f 100644
--- a/src/effects/windowview/CMakeLists.txt
+++ b/src/effects/windowview/CMakeLists.txt
@@ -11,4 +11,14 @@ qt_add_dbus_adaptor(windowview_SOURCES org.kde.KWin.Effect.WindowView1.xml windo
 
 kwin4_add_effect_module(kwin4_effect_windowview ${windowview_SOURCES})
 
+target_link_libraries(kwin4_effect_windowview PRIVATE
+    kwineffects
+    
+    KF5::ConfigGui
+    KF5::GlobalAccel
+    KF5::I18n
+
+    Qt::Quick
+    )
+
 install(DIRECTORY qml DESTINATION ${KDE_INSTALL_DATADIR}/kwin/effects/windowview)