1 files changed, 7 insertions, 28 deletions
diff --git a/src/plugins/styles/windowsvista/qwindowsxpstyle.cpp b/src/plugins/styles/windowsvista/qwindowsxpstyle.cpp
index 5039475930..a324de0fc8 100644
--- a/src/plugins/styles/windowsvista/qwindowsxpstyle.cpp
+++ b/src/plugins/styles/windowsvista/qwindowsxpstyle.cpp
@@ -215,8 +215,9 @@ static HRGN qt_hrgn_from_qregion(const QRegion &region)
 }
 
 /* \internal
-    Checks if the theme engine can/should be used, or if we should
-    fall back to Windows style.
+    Checks if the theme engine can/should be used, or if we should fall back
+    to Windows style. For Windows 10, this will still return false for the
+    High Contrast themes.
 */
 bool QWindowsXPStylePrivate::useXP(bool update)
 {
@@ -1104,10 +1105,11 @@ bool QWindowsXPStylePrivate::drawBackgroundThruNativeBuffer(XPThemeData &themeDa
 */
 
 /*!
-    Constructs a QWindowsStyle
+    \internal
+
+    Constructs a QWindowsXPStyle object.
 */
-QWindowsXPStyle::QWindowsXPStyle()
-    : QWindowsStyle(*new QWindowsXPStylePrivate)
+QWindowsXPStyle::QWindowsXPStyle(QWindowsXPStylePrivate &dd) : QWindowsStyle(dd)
 {
 }
 
@@ -1117,20 +1119,6 @@ QWindowsXPStyle::QWindowsXPStyle()
 QWindowsXPStyle::~QWindowsXPStyle() = default;
 
 /*! \reimp */
-void QWindowsXPStyle::unpolish(QApplication *app)
-{
-    QWindowsStyle::unpolish(app);
-}
-
-/*! \reimp */
-void QWindowsXPStyle::polish(QApplication *app)
-{
-    QWindowsStyle::polish(app);
-    if (!QWindowsXPStylePrivate::useXP())
-        return;
-}
-
-/*! \reimp */
 void QWindowsXPStyle::polish(QWidget *widget)
 {
     QWindowsStyle::polish(widget);
@@ -3862,15 +3850,6 @@ QIcon QWindowsXPStyle::standardIcon(StandardPixmap standardIcon,
     return QWindowsStyle::standardIcon(standardIcon, option, widget);
 }
 
-/*!
-    \internal
-
-    Constructs a QWindowsXPStyle object.
-*/
-QWindowsXPStyle::QWindowsXPStyle(QWindowsXPStylePrivate &dd) : QWindowsStyle(dd)
-{
-}
-
 #ifndef QT_NO_DEBUG_STREAM
 QDebug operator<<(QDebug d, const XPThemeData &t)
 {