From a7aee99a238a95ef56034ab5536cbdd040ae8ba0 Mon Sep 17 00:00:00 2001
From: David Edmundson <kde@davidedmundson.co.uk>
Date: Sat, 27 Mar 2021 23:00:18 +0000
Subject: [PATCH] Port kwin from Plasma Components2

Testing done:
 - ran present windows, checked the button
 - changed desktop with the OSD enabled
 - toggled nightcolour (which shows the other OSD)
---
 src/effects/presentwindows/main.qml              | 4 ++--
 src/qml/onscreennotification/plasma/main.qml     | 2 +-
 src/scripts/desktopchangeosd/contents/ui/osd.qml | 1 -
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/effects/presentwindows/main.qml b/src/effects/presentwindows/main.qml
index 13b4e74e0d..4ae4276de3 100644
--- a/src/effects/presentwindows/main.qml
+++ b/src/effects/presentwindows/main.qml
@@ -7,11 +7,11 @@
     SPDX-License-Identifier: GPL-2.0-or-later
 */
 import QtQuick 2.0
-import org.kde.plasma.components 2.0 as Plasma
+import org.kde.plasma.components 3.0 as Plasma
 
 Plasma.Button {
     id: closeButton
-    iconSource: "window-close"
+    icon.name: "window-close"
     anchors.fill: parent
     implicitWidth: units.iconSizes.medium
     implicitHeight: implicitWidth
diff --git a/src/qml/onscreennotification/plasma/main.qml b/src/qml/onscreennotification/plasma/main.qml
index ca7c9e6b19..db7ff0dc2b 100644
--- a/src/qml/onscreennotification/plasma/main.qml
+++ b/src/qml/onscreennotification/plasma/main.qml
@@ -8,7 +8,7 @@
 import QtQuick 2.0;
 import QtQuick.Window 2.0;
 import org.kde.plasma.core 2.0 as PlasmaCore;
-import org.kde.plasma.components 2.0 as Plasma;
+import org.kde.plasma.components 3.0 as Plasma;
 import QtQuick.Layouts 1.3;
 
 PlasmaCore.Dialog {
diff --git a/src/scripts/desktopchangeosd/contents/ui/osd.qml b/src/scripts/desktopchangeosd/contents/ui/osd.qml
index e2b27f8410..f481f1cc45 100644
--- a/src/scripts/desktopchangeosd/contents/ui/osd.qml
+++ b/src/scripts/desktopchangeosd/contents/ui/osd.qml
@@ -10,7 +10,6 @@ import QtQuick 2.0;
 import QtQuick.Window 2.0;
 import org.kde.plasma.core 2.0 as PlasmaCore;
 import org.kde.plasma.extras 2.0 as PlasmaExtras
-import org.kde.plasma.components 2.0 as Plasma;
 import org.kde.kquickcontrolsaddons 2.0 as KQuickControlsAddons;
 import org.kde.kwin 2.0;