diff options
| author | Miguel Costa <miguel.costa@qt.io> | 2018-11-22 18:27:35 +0100 |
|---|---|---|
| committer | Miguel Costa <miguel.costa@qt.io> | 2018-11-27 13:07:00 +0000 |
| commit | 1aaaa3bc46190e8c56df124db57f8934c19e00ae (patch) | |
| tree | 5ecbdf49421e63f689d67c85395a391e0b83fbe4 /src/qtmsbuild/qtrcc.targets | |
| parent | 24301d393bed6c3af0dfb6d7ec9fb16895eb8078 (diff) | |
Fix incompatibility with VS 2015
Fixed VS 2015 incompatibility issues in the reworked Qt/MSBuild.
Change-Id: I28e58e081f760142261343d37f1561022d557726
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'src/qtmsbuild/qtrcc.targets')
| -rw-r--r-- | src/qtmsbuild/qtrcc.targets | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/src/qtmsbuild/qtrcc.targets b/src/qtmsbuild/qtrcc.targets index 87c85669..8fb6df4b 100644 --- a/src/qtmsbuild/qtrcc.targets +++ b/src/qtmsbuild/qtrcc.targets @@ -62,18 +62,21 @@ ///////////////////////////////////////////////////////////////////////////////////////////////// // Add resource files as dependencies of the QRC file // --> - <Target Name="QtRccSetDependencies" + <Target Name="QtRccSetDependencies" DependsOnTargets="_SelectedFiles" Inputs="%(QtRcc.Identity)" Outputs="@(QtRcc->'####### Don't skip this target #######')"> <!--// Parse QRC --> - <XmlPeek Condition="'@(QtRcc)' != ''" - XmlInputPath="%(Identity)" Query="/RCC/qresource/file/text()"> - <Output TaskParameter="Result" ItemName="res_file" /> - </XmlPeek> + <Exec Condition="'@(QtRcc)' != ''" + Command="%(QtRcc.QTDIR)\bin\rcc.exe --list %(QtRcc.Identity) > $(IntDir)rcc_list.txt"/> + <ReadLinesFromFile Condition="'@(QtRcc)' != '' AND Exists('$(IntDir)rcc_list.txt')" + File="$(IntDir)rcc_list.txt"> + <Output TaskParameter="Lines" ItemName="res_file"/> + </ReadLinesFromFile> <!--// Add dependencies --> <ItemGroup Condition="'@(QtRcc)' != '' AND '@(res_file)' != ''"> <QtRcc> + <ResourceFiles>@(res_file)</ResourceFiles> <AdditionalDependencies >%(QtRcc.AdditionalDependencies);@(res_file->'%(FullPath)')</AdditionalDependencies> </QtRcc> @@ -83,6 +86,7 @@ <ItemGroup> <res_file Remove="@(res_file)"/> </ItemGroup> + <Delete Files="$(IntDir)rcc_list.txt"/> </Target> <!-- @@ -102,6 +106,7 @@ <file>[@(QtRcc->'%(Identity)')]</file> <output_file>@(QtRcc->'%(OutputFile)')</output_file> <is_selected Condition="$(selected_files.Contains('$(file)'))">true</is_selected> + <is_selected Condition="!$(selected_files.Contains('$(file)'))">false</is_selected> </PropertyGroup> <!--// Delete output file to force build of source if it was manually selected to build |