1 files changed, 15 insertions, 13 deletions
diff --git a/src/imports/controls/fusion/qquickfusionstyle.cpp b/src/imports/controls/fusion/qquickfusionstyle.cpp
index 364f8a75..95064aa4 100644
--- a/src/imports/controls/fusion/qquickfusionstyle.cpp
+++ b/src/imports/controls/fusion/qquickfusionstyle.cpp
@@ -41,6 +41,8 @@
 #include <QtGui/qpa/qplatformtheme.h>
 #include <QtGui/private/qguiapplication_p.h>
 
+#include <QtQuick/private/qquickpalette_p.h>
+
 QT_BEGIN_NAMESPACE
 
 QQuickFusionStyle::QQuickFusionStyle(QObject *parent)
@@ -68,22 +70,22 @@ QColor QQuickFusionStyle::innerContrastLine()
     return QColor(255, 255, 255, 30);
 }
 
-QColor QQuickFusionStyle::highlight(const QPalette &palette)
+QColor QQuickFusionStyle::highlight(QQuickPalette *palette)
 {
-    return palette.color(QPalette::Highlight);
+    return palette->highlight();
 }
 
-QColor QQuickFusionStyle::highlightedText(const QPalette &palette)
+QColor QQuickFusionStyle::highlightedText(QQuickPalette *palette)
 {
-    return palette.color(QPalette::HighlightedText);
+    return palette->highlightedText();
 }
 
-QColor QQuickFusionStyle::outline(const QPalette &palette)
+QColor QQuickFusionStyle::outline(QQuickPalette *palette)
 {
-    return palette.window().color().darker(140);
+    return palette->window().darker(140);
 }
 
-QColor QQuickFusionStyle::highlightedOutline(const QPalette &palette)
+QColor QQuickFusionStyle::highlightedOutline(QQuickPalette *palette)
 {
     QColor highlightedOutline = highlight(palette).darker(125);
     if (highlightedOutline.value() > 160)
@@ -91,17 +93,17 @@ QColor QQuickFusionStyle::highlightedOutline(const QPalette &palette)
     return highlightedOutline;
 }
 
-QColor QQuickFusionStyle::tabFrameColor(const QPalette &palette)
+QColor QQuickFusionStyle::tabFrameColor(QQuickPalette *palette)
 {
     return buttonColor(palette).lighter(104);
 }
 
-QColor QQuickFusionStyle::buttonColor(const QPalette &palette, bool highlighted, bool down, bool hovered)
+QColor QQuickFusionStyle::buttonColor(QQuickPalette *palette, bool highlighted, bool down, bool hovered)
 {
-    QColor buttonColor = palette.button().color();
+    QColor buttonColor = palette->button();
     int val = qGray(buttonColor.rgb());
     buttonColor = buttonColor.lighter(100 + qMax(1, (180 - val)/6));
-    buttonColor.setHsv(buttonColor.hue(), buttonColor.saturation() * 0.75, buttonColor.value());
+    buttonColor.setHsv(buttonColor.hue(), int(buttonColor.saturation() * 0.75), buttonColor.value());
     if (highlighted)
         buttonColor = mergedColors(buttonColor, highlightedOutline(palette).lighter(130), 90);
     if (!hovered)
@@ -111,7 +113,7 @@ QColor QQuickFusionStyle::buttonColor(const QPalette &palette, bool highlighted,
     return buttonColor;
 }
 
-QColor QQuickFusionStyle::buttonOutline(const QPalette &palette, bool highlighted, bool enabled)
+QColor QQuickFusionStyle::buttonOutline(QQuickPalette *palette, bool highlighted, bool enabled)
 {
     QColor darkOutline = enabled && highlighted ? highlightedOutline(palette) : outline(palette);
     return !enabled ? darkOutline.lighter(115) : darkOutline;
@@ -137,7 +139,7 @@ QColor QQuickFusionStyle::mergedColors(const QColor &colorA, const QColor &color
     return tmp;
 }
 
-QColor QQuickFusionStyle::grooveColor(const QPalette &palette)
+QColor QQuickFusionStyle::grooveColor(QQuickPalette *palette)
 {
     QColor color = buttonColor(palette);
     color.setHsv(color.hue(),