Merge branch 'Plasma/5.6'

kstyle/breezestyle.cpp

@@ -3385,7 +3385,7 @@ namespace Breeze
         const State& state( option->state );
         const bool enabled( state & State_Enabled );
         const bool mouseOver( enabled && ( state & State_MouseOver ) );
-        const bool hasFocus( ( enabled && ( state & ( State_HasFocus | State_Sunken ) ) ) && !( widget && widget->focusProxy()));
+        const bool hasFocus( ( enabled && ( state & State_HasFocus ) ) && !( widget && widget->focusProxy()));
         const bool sunken( state & ( State_On|State_Sunken ) );
         const bool flat( buttonOption->features & QStyleOptionButton::Flat );
 
@@ -6372,7 +6372,7 @@ namespace Breeze
         {
 
             // skip if not requested
-            if( !titleBarOption->subControls & subControl ) continue;
+            if( !( titleBarOption->subControls & subControl ) ) continue;
 
             // find matching icon
             QIcon icon;