Remove dependency of _SelectedFiles targetv2.7.0

The VC target _SelectedFiles is no longer a dependency of Qt tools'
targets. The required information is already given by the
$(SelectedFiles) property, so there is no need to invoke the target.
Also, in the latest version of VS 2019 (16.8), this dependency was
causing the incremental build to fail, as well as generating other
intermittent build errors.

Task-number: QTVSADDINBUG-841
Change-Id: Iceb3a3db65315a8c8c4721597338b710b74a8fdf
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>

5 files changed, 40 insertions, 17 deletions

diff --git a/src/qtmsbuild/moc/qtmoc.targets b/src/qtmsbuild/moc/qtmoc.targets
index 6773e7a2..77727024 100644
--- a/src/qtmsbuild/moc/qtmoc.targets
+++ b/src/qtmsbuild/moc/qtmoc.targets
@@ -110,14 +110,17 @@
   /////////////////////////////////////////////////////////////////////////////////////////////////
   // Prepare to process sources
   // -->
-  <Target Name="QtMocPrepare" DependsOnTargets="_SelectedFiles;QtMocInit"
+  <Target Name="QtMocPrepare" DependsOnTargets="QtMocInit"
     Inputs="%(QtMoc.Identity)" Outputs="@(QtMoc->'####### Don't skip this target #######')">
+    <ItemGroup>
+      <selected_files Include="$(SelectedFiles)"/>
+    </ItemGroup>
 
     <Message Importance="High" Condition="'$(QtDebug)' == 'true'"
         Text="## QtMocPrepare @(QtMoc)"/>
 
     <PropertyGroup>
-      <selected_files>[@(SelectedFiles->'%(Identity)','][')]</selected_files>
+      <selected_files>[@(selected_files->'%(Identity)','][')]</selected_files>
       <file>[@(QtMoc->'%(Identity)')]</file>
       <output_file>@(QtMoc->'%(OutputFile)')</output_file>
       <is_selected Condition="$(selected_files.Contains('$(file)'))">true</is_selected>
@@ -130,7 +133,7 @@
       Condition="'$(SelectedFiles)' != '' AND '$(is_selected)' == 'true'" />
 
     <!--// If a source was manually selected to build, remove all other sources -->
-    <ItemGroup Condition="'@(SelectedFiles)' != ''">
+    <ItemGroup Condition="'@(selected_files)' != ''">
       <QtMoc Remove="@(QtMoc)"
         Condition="'$(SelectedFiles)' != '' AND '$(is_selected)' != 'true'" />
     </ItemGroup>
@@ -492,6 +495,7 @@
     <ItemGroup>
       <LocalOptions Remove="@(LocalOptions)"/>
       <options Remove="@(options)"/>
+      <selected_files Remove="@(selected_files)"/>
     </ItemGroup>
   </Target>
 
diff --git a/src/qtmsbuild/qml/qtqml.targets b/src/qtmsbuild/qml/qtqml.targets
index b007178e..9045735d 100644
--- a/src/qtmsbuild/qml/qtqml.targets
+++ b/src/qtmsbuild/qml/qtqml.targets
@@ -58,9 +58,12 @@
   // Pre-process rcc source files marked for QML cache generation
   // -->
   <Target Name="QtQmlCachePrepare"
-    DependsOnTargets="_SelectedFiles;QtRccSetDependencies"
+    DependsOnTargets="QtRccSetDependencies"
     BeforeTargets="QtRccPrepare" Condition="'@(QtRcc)' != ''"
     Inputs="%(QtRcc.Identity)" Outputs="@(QtRcc->'####### Don't skip this target #######')">
+    <ItemGroup>
+      <selected_files Include="$(SelectedFiles)"/>
+    </ItemGroup>
 
     <Message Importance="High" Condition="'$(QtDebug)' == 'true'"
       Text="## QtQmlCachePrepare %(QtRcc.Identity)" />
@@ -76,14 +79,14 @@
     // $(is_selected) ::= file is selected to build
     // -->
     <PropertyGroup>
-      <selected_files>[@(SelectedFiles->'%(Identity)','][')]</selected_files>
+      <selected_files>[@(selected_files->'%(Identity)','][')]</selected_files>
       <file>[@(QtRcc->'%(Identity)')]</file>
       <output_file>@(QtRcc->'%(OutputFile)')</output_file>
       <is_selected
-        Condition="'@(SelectedFiles)' == '' OR $(selected_files.Contains('$(file)'))"
+        Condition="'@(selected_files)' == '' OR $(selected_files.Contains('$(file)'))"
         >true</is_selected>
       <is_selected
-        Condition="'@(SelectedFiles)' != '' AND !$(selected_files.Contains('$(file)'))"
+        Condition="'@(selected_files)' != '' AND !$(selected_files.Contains('$(file)'))"
         >false</is_selected>
     </PropertyGroup>
 
@@ -335,6 +338,7 @@
       <SelectedFiles>$(SelectedFiles);$(selected_rcc)</SelectedFiles>
     </PropertyGroup>
     <ItemGroup Condition="'$(selected_rcc)' != ''">
+      <selected_files Include="$(selected_rcc)"/>
       <SelectedFiles Include="$(selected_rcc)"/>
     </ItemGroup>
 
@@ -592,6 +596,9 @@
       <run_single/>
       <output_relative/>
     </PropertyGroup>
+    <ItemGroup>
+      <selected_files Remove="@(selected_files)"/>
+    </ItemGroup>
   </Target>
 
   <!--
diff --git a/src/qtmsbuild/rcc/qtrcc.targets b/src/qtmsbuild/rcc/qtrcc.targets
index 89ee0a81..2d1c8d8f 100644
--- a/src/qtmsbuild/rcc/qtrcc.targets
+++ b/src/qtmsbuild/rcc/qtrcc.targets
@@ -103,8 +103,11 @@
   /////////////////////////////////////////////////////////////////////////////////////////////////
   // Add resource files as dependencies of the QRC file
   // -->
-  <Target Name="QtRccSetDependencies" DependsOnTargets="_SelectedFiles;QtRccInit"
+  <Target Name="QtRccSetDependencies" DependsOnTargets="QtRccInit"
     Inputs="%(QtRcc.Identity)" Outputs="@(QtRcc->'####### Don't skip this target #######')">
+    <ItemGroup>
+      <selected_files Include="$(SelectedFiles)"/>
+    </ItemGroup>
 
     <!--// Parse QRC -->
     <ListQrc QrcFilePath="%(QtRcc.FullPath)">
@@ -137,14 +140,14 @@
   /////////////////////////////////////////////////////////////////////////////////////////////////
   // Prepare items for processing
   // -->
-  <Target Name="QtRccPrepare" DependsOnTargets="_SelectedFiles;QtRccSetDependencies"
+  <Target Name="QtRccPrepare" DependsOnTargets="QtRccSetDependencies"
     Inputs="%(QtRcc.Identity)" Outputs="@(QtRcc->'####### Don't skip this target #######')">
 
     <Message Importance="High" Condition="'$(QtDebug)' == 'true'"
         Text="## QtRccPrepare @(QtRcc)"/>
 
     <PropertyGroup>
-      <selected_files>[@(SelectedFiles->'%(Identity)','][')]</selected_files>
+      <selected_files>[@(selected_files->'%(Identity)','][')]</selected_files>
       <file>[@(QtRcc->'%(Identity)')]</file>
       <output_file>@(QtRcc->'%(OutputFile)')</output_file>
       <is_selected Condition="$(selected_files.Contains('$(file)'))">true</is_selected>
@@ -157,7 +160,7 @@
       Condition="'$(SelectedFiles)' != '' AND '$(is_selected)' == 'true'" />
 
     <!--// If a source was manually selected to build, remove all other sources -->
-    <ItemGroup Condition="'@(SelectedFiles)' != ''">
+    <ItemGroup Condition="'@(selected_files)' != ''">
       <QtRcc Remove="@(QtRcc)"
         Condition="'$(SelectedFiles)' != '' AND '$(is_selected)' != 'true'" />
     </ItemGroup>
@@ -526,6 +529,7 @@
     <ItemGroup>
       <LocalOptions Remove="@(LocalOptions)"/>
       <options Remove="@(options)"/>
+      <selected_files Remove="@(selected_files)"/>
     </ItemGroup>
   </Target>
 
diff --git a/src/qtmsbuild/repc/qtrepc.targets b/src/qtmsbuild/repc/qtrepc.targets
index 0d93654a..6342cbd8 100644
--- a/src/qtmsbuild/repc/qtrepc.targets
+++ b/src/qtmsbuild/repc/qtrepc.targets
@@ -84,8 +84,11 @@
   /////////////////////////////////////////////////////////////////////////////////////////////////
   // Prepare to process sources
   // -->
-  <Target Name="QtRepcPrepare" DependsOnTargets="_SelectedFiles"
+  <Target Name="QtRepcPrepare"
     Inputs="%(QtRepc.Identity)" Outputs="@(QtRepc->'####### Don't skip this target #######')">
+    <ItemGroup>
+      <selected_files Include="$(SelectedFiles)"/>
+    </ItemGroup>
 
     <Message Importance="High" Condition="'$(QtDebug)' == 'true'"
         Text="## QtRepcPrepare @(QtRepc)"/>
@@ -102,7 +105,7 @@
     </ItemGroup>
 
     <PropertyGroup>
-      <selected_files>[@(SelectedFiles->'%(Identity)','][')]</selected_files>
+      <selected_files>[@(selected_files->'%(Identity)','][')]</selected_files>
       <file>[@(QtRepc->'%(Identity)')]</file>
       <output_file>@(QtRepc->'%(OutputFile)')</output_file>
       <is_selected Condition="$(selected_files.Contains('$(file)'))">true</is_selected>
@@ -115,7 +118,7 @@
       Condition="'$(SelectedFiles)' != '' AND '$(is_selected)' == 'true'" />
 
     <!--// If a source was manually selected to build, remove all other sources -->
-    <ItemGroup Condition="'@(SelectedFiles)' != ''">
+    <ItemGroup Condition="'@(selected_files)' != ''">
       <QtRepc Remove="@(QtRepc)"
         Condition="'$(SelectedFiles)' != '' AND '$(is_selected)' != 'true'" />
     </ItemGroup>
@@ -369,6 +372,7 @@
     <ItemGroup>
       <LocalOptions Remove="@(LocalOptions)"/>
       <options Remove="@(options)"/>
+      <selected_files Remove="@(selected_files)"/>
     </ItemGroup>
   </Target>
 
diff --git a/src/qtmsbuild/uic/qtuic.targets b/src/qtmsbuild/uic/qtuic.targets
index 071da132..17f57f63 100644
--- a/src/qtmsbuild/uic/qtuic.targets
+++ b/src/qtmsbuild/uic/qtuic.targets
@@ -110,14 +110,17 @@
   /////////////////////////////////////////////////////////////////////////////////////////////////
   // Prepare to process sources
   // -->
-  <Target Name="QtUicPrepare" DependsOnTargets="_SelectedFiles;QtUicInit"
+  <Target Name="QtUicPrepare" DependsOnTargets="QtUicInit"
     Inputs="%(QtUic.Identity)" Outputs="@(QtUic->'####### Don't skip this target #######')">
+    <ItemGroup>
+      <selected_files Include="$(SelectedFiles)"/>
+    </ItemGroup>
 
     <Message Importance="High" Condition="'$(QtDebug)' == 'true'"
         Text="## QtUicPrepare @(QtUic)"/>
 
     <PropertyGroup>
-      <selected_files>[@(SelectedFiles->'%(Identity)','][')]</selected_files>
+      <selected_files>[@(selected_files->'%(Identity)','][')]</selected_files>
       <file>[@(QtUic->'%(Identity)')]</file>
       <output_file>@(QtUic->'%(OutputFile)')</output_file>
       <is_selected Condition="$(selected_files.Contains('$(file)'))">true</is_selected>
@@ -130,7 +133,7 @@
       Condition="'$(SelectedFiles)' != '' AND '$(is_selected)' == 'true'" />
 
     <!--// If a source was manually selected to build, remove all other sources -->
-    <ItemGroup Condition="'@(SelectedFiles)' != ''">
+    <ItemGroup Condition="'@(selected_files)' != ''">
       <QtUic Remove="@(QtUic)"
         Condition="'$(SelectedFiles)' != '' AND '$(is_selected)' != 'true'" />
     </ItemGroup>
@@ -388,6 +391,7 @@
     <ItemGroup>
       <LocalOptions Remove="@(LocalOptions)"/>
       <options Remove="@(options)"/>
+      <selected_files Remove="@(selected_files)"/>
     </ItemGroup>
   </Target>