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

Change-Id: I0d2601b897e4cb8ce7a0d562927f3895d1f08f25

2 files changed, 1 insertions, 3 deletions

diff --git a/src/imports/controls/fusion/qquickfusionbusyindicator.cpp b/src/imports/controls/fusion/qquickfusionbusyindicator.cpp
index 81618191..a9b75d27 100644
--- a/src/imports/controls/fusion/qquickfusionbusyindicator.cpp
+++ b/src/imports/controls/fusion/qquickfusionbusyindicator.cpp
@@ -82,7 +82,7 @@ void QQuickFusionBusyIndicator::paint(QPainter *painter)
     const qreal sz = qMin(w, h);
     const qreal dx = (w - sz) / 2;
     const qreal dy = (h - sz) / 2;
-    const int hpw = qRound(qMax(1.0, sz / 14)) & -1;
+    const int hpw = qRound(qMax(qreal(1), sz / 14)) & -1;
     const int pw = 2 * hpw;
     const QRectF bounds(dx + hpw, dy + hpw, sz - pw - 1, sz - pw - 1);
 
diff --git a/src/imports/controls/fusion/qquickfusionstyle.cpp b/src/imports/controls/fusion/qquickfusionstyle.cpp
index a66665fc..cb3889c8 100644
--- a/src/imports/controls/fusion/qquickfusionstyle.cpp
+++ b/src/imports/controls/fusion/qquickfusionstyle.cpp
@@ -85,8 +85,6 @@ QColor QQuickFusionStyle::innerContrastLine()
 
 QColor QQuickFusionStyle::highlight(const QPalette &palette)
 {
-    if (isMacSystemPalette(palette))
-        return QColor(60, 140, 230);
     return palette.color(QPalette::Highlight);
 }