Merge 1.12 into master

Change-Id: I745a07a3b25abd6c89afcd3b2199119a751e8a0c

1 files changed, 6 insertions, 7 deletions

diff --git a/src/lib/corelib/language/projectresolver.cpp b/src/lib/corelib/language/projectresolver.cpp
index 27829e378..ddac7264c 100644
--- a/src/lib/corelib/language/projectresolver.cpp
+++ b/src/lib/corelib/language/projectresolver.cpp
@@ -948,19 +948,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());
     }
 }