1 files changed, 8 insertions, 5 deletions
diff --git a/src/quicknativestyle/qtquickcontrols2nativestyleplugin.cpp b/src/quicknativestyle/qtquickcontrols2nativestyleplugin.cpp
index e0b0e77bf3..f1ff18c74f 100644
--- a/src/quicknativestyle/qtquickcontrols2nativestyleplugin.cpp
+++ b/src/quicknativestyle/qtquickcontrols2nativestyleplugin.cpp
@@ -13,10 +13,11 @@
 #include "qquickcommonstyle.h"
 
 #if defined(Q_OS_MACOS)
-#include "qquickmacstyle_mac_p.h"
 #include "qquickmacfocusframe.h"
+#include "qquickmacstyle_mac_p.h"
 #elif defined(Q_OS_WINDOWS)
-# include "qquickwindowsxpstyle_p.h"
+#include "qquickwindowsfocusframe.h"
+#include "qquickwindowsxpstyle_p.h"
 #endif
 
 QT_BEGIN_NAMESPACE
@@ -39,8 +40,8 @@ public:
     void initializeTheme(QQuickTheme *theme) override;
     QString name() const override;
 
-#if defined(Q_OS_MACOS)
-    QScopedPointer<QQuickMacFocusFrame> m_focusFrame;
+#if defined(Q_OS_MACOS) || defined (Q_OS_WIN)
+    QScopedPointer<QQuickFocusFrame> m_focusFrame;
 #endif
 };
 
@@ -111,7 +112,7 @@ void QtQuickControls2NativeStylePlugin::initializeEngine(QQmlEngine *engine, con
             style = new QMacStyle;
 #elif defined(Q_OS_WINDOWS)
             style = new QWindowsXPStyle;
-            if (QGuiApplication::styleHints()->appearance() == Qt::Appearance::Dark)
+            if (QGuiApplication::styleHints()->colorScheme() == Qt::ColorScheme::Dark)
                 qobject_cast<QWindowsStyle *>(style)->refreshPalette();
 #else
             style = new QCommonStyle;
@@ -121,6 +122,8 @@ void QtQuickControls2NativeStylePlugin::initializeEngine(QQmlEngine *engine, con
 
 #if defined(Q_OS_MACOS)
     m_focusFrame.reset(new QQuickMacFocusFrame());
+#elif defined(Q_OS_WIN)
+    m_focusFrame.reset(new QQuickWindowsFocusFrame());
 #endif
 
     qAddPostRoutine(deleteQStyle);