Revert "ci: Fix Qt settings"

This reverts commit ce48698.
DyssolTEC · Dec 4, 2024 · 3ac48cb · 3ac48cb
1 parent d83cbd2
commit 3ac48cb
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 10 deletions.
diff --git a/GUIDialogs/SettingsEditor/SettingsEditor.vcxproj b/GUIDialogs/SettingsEditor/SettingsEditor.vcxproj
@@ -45,17 +45,14 @@
   </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
@@ -43,9 +43,6 @@
   <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">
@@ -63,11 +60,11 @@
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Label="QtSettings" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <QtInstall>msvc2019_64</QtInstall>
-    <QtModules>core;widgets</QtModules>
+    <QtModules>widgets</QtModules>
   </PropertyGroup>
   <PropertyGroup Label="QtSettings" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <QtInstall>msvc2019_64</QtInstall>
-    <QtModules>core;widgets</QtModules>
+    <QtModules>widgets</QtModules>
   </PropertyGroup>
   <PropertyGroup>
     <_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>