diff options
Diffstat (limited to 'src/qtmsbuild/rcc/qtrcc.targets')
| -rw-r--r-- | src/qtmsbuild/rcc/qtrcc.targets | 29 |
1 files changed, 26 insertions, 3 deletions
diff --git a/src/qtmsbuild/rcc/qtrcc.targets b/src/qtmsbuild/rcc/qtrcc.targets index 58393605..8082bf80 100644 --- a/src/qtmsbuild/rcc/qtrcc.targets +++ b/src/qtmsbuild/rcc/qtrcc.targets @@ -58,6 +58,9 @@ <ItemGroup> <PropertyPageSchema Include="$(MSBuildThisFileDirectory)qtrcc.xml" /> + <PropertyPageSchema + Condition="'$(QtVsProjectSettings)' == 'true'" + Include="$(MSBuildThisFileDirectory)qtrcc_settings.xml" /> <AvailableItemName Include="QtRcc"> <Targets>Qt;_ClCompile</Targets> </AvailableItemName> @@ -65,16 +68,35 @@ <!-- ///////////////////////////////////////////////////////////////////////////////////////////////// + /// TARGET QtRccInit + ///////////////////////////////////////////////////////////////////////////////////////////////// + // Initialize default metadata + // --> + <Target Name="QtRccInit"> + <!--// Initialize %(OutputFile) --> + <ItemGroup Condition="'$(QtVsProjectSettings)' == 'true'"> + <QtRccAux Include="@(QtRcc)"> + <OutputFile>%(QtRcc.QtRccDir)\%(QtRcc.QtRccFileName)</OutputFile> + </QtRccAux> + <QtRcc Remove="@(QtRcc)"/> + <QtRcc Include="@(QtRccAux)"/> + <QtRccAux Remove="@(QtRccAux)"/> + </ItemGroup> + </Target> + + <!-- + ///////////////////////////////////////////////////////////////////////////////////////////////// /// TARGET QtRccSetDependencies ///////////////////////////////////////////////////////////////////////////////////////////////// // Add resource files as dependencies of the QRC file // --> - <Target Name="QtRccSetDependencies" DependsOnTargets="_SelectedFiles" + <Target Name="QtRccSetDependencies" DependsOnTargets="_SelectedFiles;QtRccInit" Inputs="%(QtRcc.Identity)" Outputs="@(QtRcc->'####### Don't skip this target #######')"> <!--// Parse QRC --> <PropertyGroup> - <QtRccExeQuoted>"%(QtRcc.QTDIR)\bin\rcc.exe"</QtRccExeQuoted> + <QtRccExeQuoted Condition="'$(QtVsProjectSettings)' == 'true'">"$(QtToolsPath)\rcc.exe"</QtRccExeQuoted> + <QtRccExeQuoted Condition="'$(QtVsProjectSettings)' != 'true'">"%(QtRcc.QTDIR)\bin\rcc.exe"</QtRccExeQuoted> <QtRccQuoted>"%(QtRcc.Identity)"</QtRccQuoted> <RccListQuoted>"$(IntDir)rcc_list.txt"</RccListQuoted> </PropertyGroup> @@ -351,7 +373,8 @@ <ItemGroup Condition="'$(run_parallel)' == 'true' OR '$(run_single)' == 'true'"> <QtWork Include="@(QtRcc)"> <WorkType>rcc</WorkType> - <ToolPath>%(QtRcc.QTDIR)\bin\rcc.exe</ToolPath> + <ToolPath Condition="'$(QtVsProjectSettings)' == 'true'">$(QtToolsPath)\rcc.exe</ToolPath> + <ToolPath Condition="'$(QtVsProjectSettings)' != 'true'">%(QtRcc.QTDIR)\bin\rcc.exe</ToolPath> <Options>$(options)</Options> <Message>%(QtRcc.ExecutionDescription)</Message> <DependenciesChanged>$(dependencies_changed)</DependenciesChanged> |