5 files changed, 23 insertions, 13 deletions
diff --git a/src/widgets/styles/qfusionstyle.cpp b/src/widgets/styles/qfusionstyle.cpp
index 2172c9082f..82c53def7d 100644
--- a/src/widgets/styles/qfusionstyle.cpp
+++ b/src/widgets/styles/qfusionstyle.cpp
@@ -2493,7 +2493,7 @@ void QFusionStyle::drawComplexControl(ComplexControl control, const QStyleOption
             QColor arrowColor = option->palette.foreground().color();
             arrowColor.setAlpha(220);
 
-            const QColor bgColor = option->palette.color(QPalette::Base);
+            const QColor bgColor = QStyleHelper::backgroundColor(option->palette, widget);
             const bool isDarkBg = bgColor.red() < 128 && bgColor.green() < 128 && bgColor.blue() < 128;
 
             if (transient) {
diff --git a/src/widgets/styles/qmacstyle_mac.mm b/src/widgets/styles/qmacstyle_mac.mm
index da6422ffec..f03a7796d9 100644
--- a/src/widgets/styles/qmacstyle_mac.mm
+++ b/src/widgets/styles/qmacstyle_mac.mm
@@ -3186,17 +3186,15 @@ void QMacStyle::drawPrimitive(PrimitiveElement pe, const QStyleOption *opt, QPai
                 fdi.version = qt_mac_hitheme_version;
                 fdi.state = tds;
                 SInt32 frame_size;
-                if (pe == PE_FrameLineEdit) {
-                    fdi.kind = frame->features & QStyleOptionFrame::Rounded ? kHIThemeFrameTextFieldRound :
-                                                                              kHIThemeFrameTextFieldSquare;
-                    GetThemeMetric(kThemeMetricEditTextFrameOutset, &frame_size);
-                    if ((frame->state & State_ReadOnly) || !(frame->state & State_Enabled))
-                        fdi.state = kThemeStateInactive;
-                } else {
-                    baseColor = QColor(150, 150, 150); //hardcoded since no query function --Sam
-                    fdi.kind = kHIThemeFrameListBox;
-                    GetThemeMetric(kThemeMetricListBoxFrameOutset, &frame_size);
-                }
+                fdi.kind = frame->features & QStyleOptionFrame::Rounded ? kHIThemeFrameTextFieldRound :
+                                                                          kHIThemeFrameTextFieldSquare;
+                GetThemeMetric(kThemeMetricEditTextFrameOutset, &frame_size);
+                if ((frame->state & State_ReadOnly) || !(frame->state & State_Enabled))
+                    fdi.state = kThemeStateInactive;
+                else if (fdi.state == kThemeStatePressed)
+                    // This pressed state doesn't make sense for a line edit frame.
+                    // And Yosemite agrees with us. Otherwise it starts showing yellow pixels.
+                    fdi.state = kThemeStateActive;
                 fdi.isFocused = (frame->state & State_HasFocus);
                 int lw = frame->lineWidth;
                 if (lw <= 0)
@@ -5134,7 +5132,7 @@ void QMacStyle::drawComplexControl(ComplexControl cc, const QStyleOptionComplex
                 [scroller initWithFrame:NSMakeRect(0, 0, slider->rect.width(), slider->rect.height())];
                 // mac os behaviour: as soon as one color channel is >= 128,
                 // the bg is considered bright, scroller is dark
-                const QColor bgColor = opt->palette.color(QPalette::Base);
+                const QColor bgColor = QStyleHelper::backgroundColor(opt->palette, widget);
                 const bool isDarkBg = bgColor.red() < 128 && bgColor.green() < 128 &&
                                       bgColor.blue() < 128;
                 if (isDarkBg)
diff --git a/src/widgets/styles/qstylehelper.cpp b/src/widgets/styles/qstylehelper.cpp
index fc73488154..6be07a3f45 100644
--- a/src/widgets/styles/qstylehelper.cpp
+++ b/src/widgets/styles/qstylehelper.cpp
@@ -45,6 +45,8 @@
 #include <private/qmath_p.h>
 #include <private/qstyle_p.h>
 #include <qmath.h>
+#include <qscrollbar.h>
+#include <qabstractscrollarea.h>
 
 #include "qstylehelper_p.h"
 #include <qstringbuilder.h>
@@ -387,5 +389,13 @@ void drawBorderPixmap(const QPixmap &pixmap, QPainter *painter, const QRect &rec
 
     }
 }
+
+QColor backgroundColor(const QPalette &pal, const QWidget* widget)
+{
+    if (qobject_cast<const QScrollBar *>(widget) && widget->parent() &&
+            qobject_cast<const QAbstractScrollArea *>(widget->parent()->parent()))
+        return widget->parentWidget()->parentWidget()->palette().color(QPalette::Base);
+    return pal.color(QPalette::Base);
+}
 }
 QT_END_NAMESPACE
diff --git a/src/widgets/styles/qstylehelper_p.h b/src/widgets/styles/qstylehelper_p.h
index 6355cbc985..73e5c94dcd 100644
--- a/src/widgets/styles/qstylehelper_p.h
+++ b/src/widgets/styles/qstylehelper_p.h
@@ -86,6 +86,7 @@ namespace QStyleHelper
     bool isInstanceOf(QObject *obj, QAccessible::Role role);
     bool hasAncestor(QObject *obj, QAccessible::Role role);
 #endif
+    QColor backgroundColor(const QPalette &pal, const QWidget* widget = 0);
 }
 
 
diff --git a/src/widgets/styles/qstylesheetstyle.cpp b/src/widgets/styles/qstylesheetstyle.cpp
index a22d0a3dca..b82aa1b5a0 100644
--- a/src/widgets/styles/qstylesheetstyle.cpp
+++ b/src/widgets/styles/qstylesheetstyle.cpp
@@ -2698,6 +2698,7 @@ void QStyleSheetStyle::polish(QWidget *w)
         styleSheetCaches->styleRulesCache.remove(w);
         styleSheetCaches->hasStyleRuleCache.remove(w);
         styleSheetCaches->renderRulesCache.remove(w);
+        styleSheetCaches->styleSheetCache.remove(w);
     }
     setGeometry(w);
     setProperties(w);