From 7e2687ed3fd8517bedfa71b7b65b9260672b325a Mon Sep 17 00:00:00 2001
From: Bhushan Shah <bhush94@gmail.com>
Date: Thu, 7 Jun 2018 17:46:55 +0530
Subject: [PATCH 1/2] Update version number for 5.13.0 GIT_SILENT

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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f7fee3a717..a843f2ffbc 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.12.90")
+set(PROJECT_VERSION "5.13.0")
 set(PROJECT_VERSION_MAJOR 5)
 
 set(QT_MIN_VERSION "5.9.0")

From c44adda40f47418ce6eea974b2a3c3b1e77fa205 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Fl=C3=B6ser?= <mgraesslin@kde.org>
Date: Sun, 3 Jun 2018 13:29:36 +0200
Subject: [PATCH 2/2] Hide decoration tooltip when the decoration gets
 destroyed

Summary:
BUG: 394977
FIXED-IN: 5.13.1

Test Plan: Manual testing

Reviewers: #kwin, #plasma

Subscribers: kwin

Tags: #kwin

Differential Revision: https://phabricator.kde.org/D13299
---
 decorations/decoratedclient.cpp | 9 ++++++++-
 decorations/decoratedclient.h   | 1 +
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/decorations/decoratedclient.cpp b/decorations/decoratedclient.cpp
index 6d4b6e7b32..2664c44d5a 100644
--- a/decorations/decoratedclient.cpp
+++ b/decorations/decoratedclient.cpp
@@ -123,11 +123,17 @@ DecoratedClientImpl::DecoratedClientImpl(AbstractClient *client, KDecoration2::D
                 this->m_toolTipFallAsleep.setRemainingTime(fallAsleepDelay);
 
                 QToolTip::showText(Cursor::pos(), this->m_toolTipText);
+                m_toolTipShowing = true;
             }
     );
 }
 
-DecoratedClientImpl::~DecoratedClientImpl() = default;
+DecoratedClientImpl::~DecoratedClientImpl()
+{
+    if (m_toolTipShowing) {
+        requestHideToolTip();
+    }
+}
 
 void DecoratedClientImpl::signalShadeChange() {
     emit decoratedClient()->shadedChanged(m_client->isShade());
@@ -224,6 +230,7 @@ void DecoratedClientImpl::requestHideToolTip()
 {
     m_toolTipWakeUp.stop();
     QToolTip::hideText();
+    m_toolTipShowing = false;
 }
 
 void DecoratedClientImpl::requestShowWindowMenu()
diff --git a/decorations/decoratedclient.h b/decorations/decoratedclient.h
index adb5399aec..f21503256d 100644
--- a/decorations/decoratedclient.h
+++ b/decorations/decoratedclient.h
@@ -115,6 +115,7 @@ private:
     QString m_toolTipText;
     QTimer m_toolTipWakeUp;
     QDeadlineTimer m_toolTipFallAsleep;
+    bool m_toolTipShowing = false;
 };
 
 }