From c42a4234aafcdae5909e631013ca240008cd4728 Mon Sep 17 00:00:00 2001
From: Jonathan Riddell <jr@jriddell.org>
Date: Tue, 29 Oct 2019 17:57:26 +0000
Subject: [PATCH 1/2] Update version number for 5.17.2 GIT_SILENT

---
 CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6a722646b4..62936b5517 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 3.1 FATAL_ERROR)
 
 project(KWIN)
-set(PROJECT_VERSION "5.17.1")
+set(PROJECT_VERSION "5.17.2")
 set(PROJECT_VERSION_MAJOR 5)
 
 set(QT_MIN_VERSION "5.12.0")

From 87f36f53b3e64012bce2edc59f553341fc04cfc2 Mon Sep 17 00:00:00 2001
From: Kai Uwe Broulik <kde@privat.broulik.de>
Date: Fri, 1 Nov 2019 22:40:35 +0100
Subject: [PATCH 2/2] [effects/startupfeedback] Fallback to small icon size
 when no cursor size is configured

As appears to be the case with the default setup...

BUG: 413605
FIXED-IN: 5.17.3

Differential Revision: https://phabricator.kde.org/D25065
---
 effects/startupfeedback/startupfeedback.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/effects/startupfeedback/startupfeedback.cpp b/effects/startupfeedback/startupfeedback.cpp
index 834dcf7a61..f25d86724f 100644
--- a/effects/startupfeedback/startupfeedback.cpp
+++ b/effects/startupfeedback/startupfeedback.cpp
@@ -27,6 +27,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <QPainter>
 // KDE
 #include <KConfigGroup>
+#include <KIconLoader>
 #include <KSharedConfig>
 #include <KStartupInfo>
 #include <KSelectionOwner>
@@ -284,7 +285,10 @@ void StartupFeedbackEffect::start(const QString& icon)
         return cursorSize;
     };
     m_cursorSize = readCursorSize();
-    const int iconSize = m_cursorSize / 1.5;
+    int iconSize = m_cursorSize / 1.5;
+    if (!iconSize) {
+        iconSize = IconSize(KIconLoader::Small);
+    }
     // get ratio for bouncing cursor so we don't need to manually calculate the sizes for each icon size
     if (m_type == BouncingFeedback)
         m_bounceSizesRatio = iconSize / 16.0;