Merge topic 'autogen-revert-ui-rebuild' into release-3.31

debc4d3906 Autogen: Revert adding ui files to byproducts of the timestamp target

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !10056

1 files changed, 3 insertions, 19 deletions

diff --git a/Source/cmQtAutoGenInitializer.cxx b/Source/cmQtAutoGenInitializer.cxx
index b75a574..c9dd154 100644
--- a/Source/cmQtAutoGenInitializer.cxx
+++ b/Source/cmQtAutoGenInitializer.cxx
@@ -1340,25 +1340,9 @@ bool cmQtAutoGenInitializer::InitAutogenTarget()
   }
 
   if (this->Uic.Enabled) {
-    auto const useAdvancedUicGraph = [this]() -> bool {
-      if (this->MultiConfig && this->GlobalGen->IsNinja()) {
-        return this->UseBetterGraph;
-      }
-      return true;
-    }();
-    if (useAdvancedUicGraph) {
-      // Make all ui_*.h files byproducts of the ${target}_autogen/timestamp
-      // custom command if the generation of depfile is enabled.
-      auto& byProducts = useDepfile ? timestampByproducts : autogenByproducts;
-      for (auto const& file : this->Uic.UiHeaders) {
-        this->AddGeneratedSource(file.first, this->Uic);
-        byProducts.push_back(file.second);
-      }
-    } else {
-      for (auto const& file : this->Uic.UiHeaders) {
-        this->AddGeneratedSource(file.first, this->Uic);
-        autogenByproducts.push_back(file.second);
-      }
+    for (auto const& file : this->Uic.UiHeaders) {
+      this->AddGeneratedSource(file.first, this->Uic);
+      autogenByproducts.push_back(file.second);
     }
   }