From ce48698618d37ead602de8f63c150b3b860ec984 Mon Sep 17 00:00:00 2001
From: Vasyl Skorych <vasyl.skorych@gmail.com>
Date: Wed, 4 Dec 2024 10:12:31 +0100
Subject: [PATCH] ci: Fix Qt settings

---
 GUIDialogs/SettingsEditor/SettingsEditor.vcxproj | 7 +++++--
 GUIWidgets/StatusWindow/StatusWindow.vcxproj     | 7 +++++--
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/GUIDialogs/SettingsEditor/SettingsEditor.vcxproj b/GUIDialogs/SettingsEditor/SettingsEditor.vcxproj
index 1feff15a..9e4c4eb8 100644
--- a/GUIDialogs/SettingsEditor/SettingsEditor.vcxproj
+++ b/GUIDialogs/SettingsEditor/SettingsEditor.vcxproj
@@ -45,14 +45,17 @@
   </Target>
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
+  <ImportGroup Condition="Exists('$(QtMsBuild)\qt_defaults.props')">
+    <Import Project="$(QtMsBuild)\qt_defaults.props" />
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(QtMsBuild)\Qt.props" />
+    <Import Project="$(QtMsBuild)\qt.props" />
     <Import Project="$(SolutionDir)PropertySheets\CommonQt.props" />
     <Import Project="$(SolutionDir)PropertySheets\CommonDebug.props" />
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(QtMsBuild)\Qt.props" />
+    <Import Project="$(QtMsBuild)\qt.props" />
     <Import Project="$(SolutionDir)PropertySheets\CommonQt.props" />
     <Import Project="$(SolutionDir)PropertySheets\CommonRelease.props" />
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
diff --git a/GUIWidgets/StatusWindow/StatusWindow.vcxproj b/GUIWidgets/StatusWindow/StatusWindow.vcxproj
index 102e25ca..d9ab2c41 100644
--- a/GUIWidgets/StatusWindow/StatusWindow.vcxproj
+++ b/GUIWidgets/StatusWindow/StatusWindow.vcxproj
@@ -43,6 +43,9 @@
   <Target Name="QtMsBuildNotFound" BeforeTargets="CustomBuild;ClCompile" Condition="!Exists('$(QtMsBuild)\qt.targets') or !Exists('$(QtMsBuild)\qt.props')">
     <Message Importance="High" Text="QtMsBuild: could not locate qt.targets, qt.props; project may not build correctly." />
   </Target>
+  <ImportGroup Condition="Exists('$(QtMsBuild)\qt_defaults.props')">
+    <Import Project="$(QtMsBuild)\qt_defaults.props" />
+  </ImportGroup>
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
@@ -60,11 +63,11 @@
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Label="QtSettings" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <QtInstall>msvc2019_64</QtInstall>
-    <QtModules>widgets</QtModules>
+    <QtModules>core;widgets</QtModules>
   </PropertyGroup>
   <PropertyGroup Label="QtSettings" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <QtInstall>msvc2019_64</QtInstall>
-    <QtModules>widgets</QtModules>
+    <QtModules>core;widgets</QtModules>
   </PropertyGroup>
   <PropertyGroup>
     <_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>