From 325c8f610659fa48a38783f31260f970be7600f3 Mon Sep 17 00:00:00 2001
From: Hugo Pereira Da Costa <hugo.pereira.da.costa@gmail.com>
Date: Wed, 24 Aug 2016 10:14:19 +0200
Subject: [PATCH] Homogenize how toolbutton arrow is detected between -
 drawToolButtonComplexControl - toolButtonSizeFromContents - and
 toolButtonSubControlRect

BUG: 367723
---
 kstyle/breezestyle.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/kstyle/breezestyle.cpp b/kstyle/breezestyle.cpp
index 2a994fe8..73f09e11 100644
--- a/kstyle/breezestyle.cpp
+++ b/kstyle/breezestyle.cpp
@@ -2671,7 +2671,7 @@ namespace Breeze
         // get relevant state flags
         const State& state( option->state );
         const bool autoRaise( state & State_AutoRaise );
-        const bool hasPopupMenu( toolButtonOption->subControls & SC_ToolButtonMenu );
+        const bool hasPopupMenu( toolButtonOption->features & QStyleOptionToolButton::MenuButtonPopup );
         const bool hasInlineIndicator(
             toolButtonOption->features&QStyleOptionToolButton::HasMenu
             && toolButtonOption->features&QStyleOptionToolButton::PopupDelay
@@ -5862,7 +5862,7 @@ namespace Breeze
         // copy option and alter palette
         QStyleOptionToolButton copy( *toolButtonOption );
 
-        const bool hasPopupMenu( toolButtonOption->subControls & SC_ToolButtonMenu );
+        const bool hasPopupMenu( toolButtonOption->features & QStyleOptionToolButton::MenuButtonPopup );
         const bool hasInlineIndicator(
             toolButtonOption->features&QStyleOptionToolButton::HasMenu
             && toolButtonOption->features&QStyleOptionToolButton::PopupDelay