Skip to content

Commit

Permalink
ci: Fix Qt settings
Browse files Browse the repository at this point in the history
  • Loading branch information
vasylskorych committed Dec 4, 2024
1 parent a73ebfa commit ce48698
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 4 deletions.
7 changes: 5 additions & 2 deletions GUIDialogs/SettingsEditor/SettingsEditor.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand Down
7 changes: 5 additions & 2 deletions GUIWidgets/StatusWindow/StatusWindow.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand All @@ -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>
Expand Down

0 comments on commit ce48698

Please sign in to comment.