diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b7961893..dc9985b7 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -7,3 +7,4 @@ include:
   - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/linux-qt6.yml
   - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/windows.yml
   - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/freebsd-qt6.yml
+  - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/windows-qt6.yml
diff --git a/kstyle/CMakeLists.txt b/kstyle/CMakeLists.txt
index e1af2c69..637849f2 100644
--- a/kstyle/CMakeLists.txt
+++ b/kstyle/CMakeLists.txt
@@ -18,7 +18,7 @@ endif()
 if (TARGET Qt5::Core)
     find_package(Qt5 ${QT_MIN_VERSION} OPTIONAL_COMPONENTS X11Extras)
     set(BREEZE_HAVE_QTX11EXTRAS ${Qt5X11Extras_FOUND})
-else()
+elseif(NOT WIN32)
     set(BREEZE_HAVE_QTX11EXTRAS TRUE) # part of Qt6::Gui
 endif()
 
diff --git a/kstyle/config/CMakeLists.txt b/kstyle/config/CMakeLists.txt
index 5b635614..67cfda92 100644
--- a/kstyle/config/CMakeLists.txt
+++ b/kstyle/config/CMakeLists.txt
@@ -21,7 +21,7 @@ kcmutils_generate_desktop_file(breezestyleconfig)
 set(breeze_settings_SOURCES main.cpp)
 add_executable(breeze-settings5 ${breeze_settings_SOURCES} )
 target_link_libraries(breeze-settings5 Qt::Core Qt::Gui Qt::Widgets )
-target_link_libraries(breeze-settings5 KF5::I18n KF5::KCMUtils)
+target_link_libraries(breeze-settings5 KF5::I18n KF5::KCMUtils KF5::CoreAddons)
 
 install(TARGETS breeze-settings5 ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})