Merge conflicts by hand

8 years ago · bb3727e936
parent 67b6926d14
commit bb3727e936
1 changed files with 0 additions and 1 deletions
--- a/kstyle/breezestyle.cpp
+++ b/kstyle/breezestyle.cpp
@ -5659,7 +5659,6 @@ namespace Breeze
            color = (documentMode&&!isQtQuickControl&&!hasAlteredBackground(widget)) ? palette.color( QPalette::Window ) : _helper->frameBackgroundColor( palette );

        } else {
-
            const auto normal( _helper->alphaColor( palette.color( QPalette::Shadow ), 0.2 ) );
            const auto hover( _helper->alphaColor( _helper->hoverColor( palette ), 0.2 ) );
            if( animated ) color = KColorUtils::mix( normal, hover, opacity );