Merge branch '1.15' into master

Change-Id: I893a0c195de293fead09db63b7fcdf48bbfab61c

2 files changed, 7 insertions, 6 deletions

diff --git a/src/lib/corelib/buildgraph/rulesapplicator.cpp b/src/lib/corelib/buildgraph/rulesapplicator.cpp
index 437e3f4da..5d1144636 100644
--- a/src/lib/corelib/buildgraph/rulesapplicator.cpp
+++ b/src/lib/corelib/buildgraph/rulesapplicator.cpp
@@ -79,12 +79,13 @@ namespace Internal {
 
 RulesApplicator::RulesApplicator(
         ResolvedProductPtr product,
-        std::unordered_map<QString, const ResolvedProduct *> productsByName,
-        std::unordered_map<QString, const ResolvedProject *> projectsByName,
+        const std::unordered_map<QString, const ResolvedProduct *> &productsByName,
+        const std::unordered_map<QString, const ResolvedProject *> &projectsByName,
         Logger logger)
     : m_product(std::move(product))
-    , m_productsByName(std::move(productsByName))
-    , m_projectsByName(std::move(projectsByName))
+    // m_productsByName and m_projectsByName are references, cannot move-construct
+    , m_productsByName(productsByName)
+    , m_projectsByName(projectsByName)
     , m_mocScanner(nullptr)
     , m_logger(std::move(logger))
 {
diff --git a/src/lib/corelib/buildgraph/rulesapplicator.h b/src/lib/corelib/buildgraph/rulesapplicator.h
index 1160f3d09..da7815014 100644
--- a/src/lib/corelib/buildgraph/rulesapplicator.h
+++ b/src/lib/corelib/buildgraph/rulesapplicator.h
@@ -63,8 +63,8 @@ class RulesApplicator
 {
 public:
     RulesApplicator(ResolvedProductPtr product,
-                    std::unordered_map<QString, const ResolvedProduct *> productsByName,
-                    std::unordered_map<QString, const ResolvedProject *> projectsByName,
+                    const std::unordered_map<QString, const ResolvedProduct *> &productsByName,
+                    const std::unordered_map<QString, const ResolvedProject *> &projectsByName,
                     Logger logger);
     ~RulesApplicator();