1 files changed, 7 insertions, 7 deletions
diff --git a/src/widgets/widgets/qcommandlinkbutton.cpp b/src/widgets/widgets/qcommandlinkbutton.cpp
index 5a82e63f44..5c7d2601d9 100644
--- a/src/widgets/widgets/qcommandlinkbutton.cpp
+++ b/src/widgets/widgets/qcommandlinkbutton.cpp
@@ -171,8 +171,8 @@ bool QCommandLinkButtonPrivate::usingVistaStyle() const
     Q_Q(const QCommandLinkButton);
     //### This is a hack to detect if we are indeed running Vista style themed and not in classic
     // When we add api to query for this, we should change this implementation to use it.
-    return q->style()->inherits("QWindowsVistaStyle")
-        && q->style()->pixelMetric(QStyle::PM_ButtonShiftHorizontal, nullptr) == 0;
+    return q->property("_qt_usingVistaStyle").toBool()
+        && q->style()->pixelMetric(QStyle::PM_ButtonShiftHorizontal, nullptr, q) == 0;
 }
 
 void QCommandLinkButtonPrivate::init()
@@ -189,7 +189,7 @@ void QCommandLinkButtonPrivate::init()
     q->setIconSize(QSize(20, 20));
     QStyleOptionButton opt;
     q->initStyleOption(&opt);
-    q->setIcon(q->style()->standardIcon(QStyle::SP_CommandLink, &opt));
+    q->setIcon(q->style()->standardIcon(QStyle::SP_CommandLink, &opt, q));
 }
 
 // Calculates the height of the description text based on widget width
@@ -325,9 +325,9 @@ void QCommandLinkButton::paintEvent(QPaintEvent *)
     QSize pixmapSize = icon().actualSize(iconSize());
 
     const int vOffset = isDown()
-        ? style()->pixelMetric(QStyle::PM_ButtonShiftVertical, &option) : 0;
+        ? style()->pixelMetric(QStyle::PM_ButtonShiftVertical, &option, this) : 0;
     const int hOffset = isDown()
-        ? style()->pixelMetric(QStyle::PM_ButtonShiftHorizontal, &option) : 0;
+        ? style()->pixelMetric(QStyle::PM_ButtonShiftHorizontal, &option, this) : 0;
 
     //Draw icon
     p.drawControl(QStyle::CE_PushButton, option);
@@ -339,9 +339,9 @@ void QCommandLinkButton::paintEvent(QPaintEvent *)
     //Draw title
     QColor textColor = palette().buttonText().color();
     if (isEnabled() && d->usingVistaStyle()) {
-        textColor = QColor(21, 28, 85);
+        textColor = option.palette.buttonText().color();
         if (underMouse() && !isDown())
-            textColor = QColor(7, 64, 229);
+            textColor = option.palette.brightText().color();
         //A simple text color transition
         d->currentColor = d->mergedColors(textColor, d->currentColor, 60);
         option.palette.setColor(QPalette::ButtonText, d->currentColor);