Store product names in ExportedModule

... rather than product pointers. ExportedModule objects can be stored
in Transformers, which potentially outlive the referenced products.
Alternatively, we could update the product pointers during change
tracking, but that would be tedious and error-prone.

[ChangeLog] Fixed possible crash on storing a build graph after re-
resolving.

Change-Id: I09bcf638a17da410198524858eb4c1bda59bebcb
Reviewed-by: Christian Stenger <christian.stenger@qt.io>

1 files changed, 6 insertions, 7 deletions

diff --git a/src/lib/corelib/language/projectresolver.cpp b/src/lib/corelib/language/projectresolver.cpp
index 348858f2b..97015dae4 100644
--- a/src/lib/corelib/language/projectresolver.cpp
+++ b/src/lib/corelib/language/projectresolver.cpp
@@ -911,19 +911,18 @@ void ProjectResolver::collectExportedProductDependencies()
             if (!contains(directDepNames, dep.product->name))
                 continue;
 
-            if (!contains(exportingProduct->exportedModule.productDependencies, dep.product))
-                exportingProduct->exportedModule.productDependencies.push_back(dep.product);
+            if (!contains(exportingProduct->exportedModule.productDependencies,
+                          dep.product->uniqueName())) {
+                exportingProduct->exportedModule.productDependencies.push_back(
+                            dep.product->uniqueName());
+            }
             if (!dep.parameters.isEmpty()) {
                 exportingProduct->exportedModule.dependencyParameters.insert(dep.product,
                                                                              dep.parameters);
             }
         }
         auto &productDeps = exportingProduct->exportedModule.productDependencies;
-        static const auto cmpFunc = [](const ResolvedProductConstPtr &p1,
-                const ResolvedProductConstPtr &p2) {
-            return p1->uniqueName() < p2->uniqueName();
-        };
-        std::sort(productDeps.begin(), productDeps.end(), cmpFunc);
+        std::sort(productDeps.begin(), productDeps.end());
     }
 }