Merge remote-tracking branch 'origin/5.13' into dev

Change-Id: I6f266cebe768f36d0f8066d5ce0451a557903174

2 files changed, 5 insertions, 2 deletions

diff --git a/src/imports/controls/fusion/qquickfusionstyle.cpp b/src/imports/controls/fusion/qquickfusionstyle.cpp
index 98c1894f..7797463a 100644
--- a/src/imports/controls/fusion/qquickfusionstyle.cpp
+++ b/src/imports/controls/fusion/qquickfusionstyle.cpp
@@ -82,7 +82,7 @@ QColor QQuickFusionStyle::outline(const QPalette &palette)
 {
     if (palette.window().style() == Qt::TexturePattern)
         return QColor(0, 0, 0, 160);
-    return palette.background().color().darker(140);
+    return palette.window().color().darker(140);
 }
 
 QColor QQuickFusionStyle::highlightedOutline(const QPalette &palette)
diff --git a/src/imports/controls/fusion/qquickfusiontheme.cpp b/src/imports/controls/fusion/qquickfusiontheme.cpp
index 107619bf..903758bb 100644
--- a/src/imports/controls/fusion/qquickfusiontheme.cpp
+++ b/src/imports/controls/fusion/qquickfusiontheme.cpp
@@ -45,7 +45,10 @@ void QQuickFusionTheme::initialize(QQuickTheme *theme)
 {
     const bool isDarkSystemTheme = QQuickStylePrivate::isDarkSystemTheme();
     QPalette systemPalette;
-    systemPalette.setColor(QPalette::ButtonText, isDarkSystemTheme ? Qt::white : Qt::black);
+    systemPalette.setColor(QPalette::Active, QPalette::ButtonText,
+        isDarkSystemTheme ? QColor::fromRgb(0xe7e7e7) : QColor::fromRgb(0x252525));
+    systemPalette.setColor(QPalette::Disabled, QPalette::ButtonText,
+        isDarkSystemTheme ? QColor::fromRgb(0x777777) : QColor::fromRgb(0xb6b6b6));
     theme->setPalette(QQuickTheme::System, systemPalette);
 }