Commit 6098e13
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -21,8 +21,7 @@ | |||
| 21 | 21 | <Keyword>QtVS_v304</Keyword> | |
| 22 | 22 | <WindowsTargetPlatformVersion Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">10.0.22621.0</WindowsTargetPlatformVersion> | |
| 23 | 23 | <WindowsTargetPlatformVersion Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">10.0.22621.0</WindowsTargetPlatformVersion> | |
| 24 | - <QtMsBuild Condition="'$(QtMsBuild)'=='' OR !Exists('$(QtMsBuild)\qt.targets')" | ||
| 25 | - >$(MSBuildProjectDirectory)\QtMsBuild</QtMsBuild> | ||
| 24 | + <QtMsBuild Condition="'$(QtMsBuild)'=='' OR !Exists('$(QtMsBuild)\qt.targets')">$(MSBuildProjectDirectory)\QtMsBuild</QtMsBuild> | ||
| 26 | 25 | </PropertyGroup> | |
| 27 | 26 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> | |
| 28 | 27 | <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'" Label="Configuration"> | |
@@ -47,11 +46,8 @@ | |||
| 47 | 46 | <QtModules>core</QtModules> | |
| 48 | 47 | <QtBuildConfig>release</QtBuildConfig> | |
| 49 | 48 | </PropertyGroup> | |
| 50 | - <Target Name="QtMsBuildNotFound" | ||
| 51 | - BeforeTargets="CustomBuild;ClCompile" | ||
| 52 | - Condition="!Exists('$(QtMsBuild)\qt.targets') or !Exists('$(QtMsBuild)\qt.props')"> | ||
| 53 | - <Message Importance="High" | ||
| 54 | - Text="QtMsBuild: could not locate qt.targets, qt.props; project may not build correctly." /> | ||
| 49 | + <Target Name="QtMsBuildNotFound" BeforeTargets="CustomBuild;ClCompile" Condition="!Exists('$(QtMsBuild)\qt.targets') or !Exists('$(QtMsBuild)\qt.props')"> | ||
| 50 | + <Message Importance="High" Text="QtMsBuild: could not locate qt.targets, qt.props; project may not build correctly." /> | ||
| 55 | 51 | </Target> | |
| 56 | 52 | <ImportGroup Label="ExtensionSettings" /> | |
| 57 | 53 | <ImportGroup Label="Shared" /> | |
@@ -68,6 +64,12 @@ | |||
| 68 | 64 | </PropertyGroup> | |
| 69 | 65 | <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'"> | |
| 70 | 66 | </PropertyGroup> | |
| 67 | + <PropertyGroup Label="QtDeploy" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> | ||
| 68 | + <QtDeploy>false</QtDeploy> | ||
| 69 | + </PropertyGroup> | ||
| 70 | + <PropertyGroup Label="QtDeploy" Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> | ||
| 71 | + <QtDeploy>true</QtDeploy> | ||
| 72 | + </PropertyGroup> | ||
| 71 | 73 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'" Label="Configuration"> | |
| 72 | 74 | <ClCompile> | |
| 73 | 75 | <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType> | |
@@ -94,7 +96,6 @@ | |||
| 94 | 96 | </ItemDefinitionGroup> | |
| 95 | 97 | <ItemGroup> | |
| 96 | 98 | <ClCompile Include="main.cpp" /> | |
| 97 | - | ||
| 98 | 99 | </ItemGroup> | |
| 99 | 100 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> | |
| 100 | 101 | <ImportGroup Condition="Exists('$(QtMsBuild)\qt.targets')"> | |
0 commit comments