From 45a9016935bf5c6c00b055d61b06266e5c65f0a1 Mon Sep 17 00:00:00 2001
From: Jonathan Riddell <jr@jriddell.org>
Date: Thu, 26 Jan 2017 11:00:46 +0000
Subject: [PATCH 1/3] Update version number for 5.9.0 GIT_SILENT

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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4c917cca..9ca9f417 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,5 +1,5 @@
 project(breeze)
-set(PROJECT_VERSION "5.8.95")
+set(PROJECT_VERSION "5.9.0")
 set(PROJECT_VERSION_MAJOR 5)
 
 cmake_minimum_required(VERSION 2.8.12 FATAL_ERROR)

From e19336ab51c4c1eeae4d9b9a6c6a8ceb56828ea1 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Sat, 28 Jan 2017 08:15:14 +0100
Subject: [PATCH 2/3] SVN_SILENT made messages (.desktop file) - always resolve
 ours

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
---
 kstyle/config/breezestyleconfig.desktop | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kstyle/config/breezestyleconfig.desktop b/kstyle/config/breezestyleconfig.desktop
index 84ef53e8..8ff2be51 100644
--- a/kstyle/config/breezestyleconfig.desktop
+++ b/kstyle/config/breezestyleconfig.desktop
@@ -101,7 +101,7 @@ X-KDE-Keywords[es]=breeze,brisa,elemento gráfico,widget,estilo
 X-KDE-Keywords[et]=breeze,vidin,stiil
 X-KDE-Keywords[fi]=breeze,widget,style,käyttöliittymäelementti,tyyli,elementti,kontrolli
 X-KDE-Keywords[fr]=brise,composant graphique, style
-X-KDE-Keywords[gl]=breeze,trebello,widget,estilo
+X-KDE-Keywords[gl]=breeze,trebello,trebello,estilo
 X-KDE-Keywords[hu]=breeze,elem,stílus
 X-KDE-Keywords[it]=brezza,oggetto,stile
 X-KDE-Keywords[ko]=breeze,widget,style,위젯,스타일

From 4d272dcbb53e666208c91fdda79a2b0de64ba727 Mon Sep 17 00:00:00 2001
From: Kai Uwe Broulik <kde@privat.broulik.de>
Date: Fri, 3 Feb 2017 10:57:41 +0100
Subject: [PATCH 3/3] [KStyle] Don't draw focus indicator on ComboBox entries

This results in the highlight in ComboBox popups being "cut-off" (it renders a white line there) at the bottom.

Differential Revision: https://phabricator.kde.org/D4426
---
 kstyle/breezestyle.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/kstyle/breezestyle.cpp b/kstyle/breezestyle.cpp
index a16ba54b..d3902db0 100644
--- a/kstyle/breezestyle.cpp
+++ b/kstyle/breezestyle.cpp
@@ -3067,6 +3067,11 @@ namespace Breeze
         if ( qobject_cast< const QAbstractButton*>( widget ) || qobject_cast< const QScrollBar*>( widget ) )
             return true;
 
+        // no focus indicator on ComboBox list items
+        if (widget && widget->inherits("QComboBoxListView")) {
+            return true;
+        }
+
         #if QT_VERSION >= 0x050000
             if ( option->styleObject && option->styleObject->property("elementType") == QLatin1String("button") )
                 return true;