4 files changed, 14 insertions, 14 deletions
diff --git a/src/qmlcompiler/qqmljscompiler.cpp b/src/qmlcompiler/qqmljscompiler.cpp
index ba796b388f..5aa8a62786 100644
--- a/src/qmlcompiler/qqmljscompiler.cpp
+++ b/src/qmlcompiler/qqmljscompiler.cpp
@@ -791,7 +791,7 @@ QQmlJSAotFunction QQmlJSAotCompiler::doCompileAndRecordAotStats(
         QQmlJS::DiagnosticMessage *error, const QString &name, QQmlJS::SourceLocation location)
 {
     auto t1 = std::chrono::high_resolution_clock::now();
-    auto &&result = doCompile(context, function, error);
+    QQmlJSAotFunction result = doCompile(context, function, error);
     auto t2 = std::chrono::high_resolution_clock::now();
 
     if (QQmlJS::QQmlJSAotCompilerStats::recordAotStats()) {
diff --git a/src/qmlcompiler/qqmljscompilerstats.cpp b/src/qmlcompiler/qqmljscompilerstats.cpp
index b65afd412f..9e564834e7 100644
--- a/src/qmlcompiler/qqmljscompilerstats.cpp
+++ b/src/qmlcompiler/qqmljscompilerstats.cpp
@@ -26,7 +26,7 @@ bool QQmlJS::AotStatsEntry::operator<(const AotStatsEntry &other) const
     return line < other.line;
 }
 
-void AotStats::insert(AotStats other)
+void AotStats::insert(const AotStats &other)
 {
     for (const auto &[moduleUri, moduleStats] : other.m_entries.asKeyValueRange()) {
         m_entries[moduleUri].insert(moduleStats);
@@ -111,10 +111,10 @@ AotStats AotStats::fromJsonDocument(const QJsonDocument &document)
             }
 
             std::sort(stats.begin(), stats.end());
-            files[filepath] = stats;
+            files[filepath] = std::move(stats);
         }
 
-        result.m_entries[moduleId] = files;
+        result.m_entries[moduleId] = std::move(files);
     }
 
     return result;
@@ -160,7 +160,8 @@ QJsonDocument AotStats::toJsonDocument() const
     return QJsonDocument(modulesArray);
 }
 
-void AotStats::addEntry(const QString &moduleId, const QString &filepath, AotStatsEntry entry)
+void AotStats::addEntry(
+        const QString &moduleId, const QString &filepath, const AotStatsEntry &entry)
 {
     m_entries[moduleId][filepath].append(entry);
 }
@@ -177,10 +178,9 @@ bool AotStats::saveToDisk(const QString &filepath) const
     return true;
 }
 
-void QQmlJSAotCompilerStats::addEntry(QString filepath, QQmlJS::AotStatsEntry entry)
+void QQmlJSAotCompilerStats::addEntry(const QString &filepath, const QQmlJS::AotStatsEntry &entry)
 {
-    auto *aotstats = QQmlJSAotCompilerStats::instance();
-    aotstats->addEntry(s_moduleId, filepath, entry);
+    QQmlJSAotCompilerStats::instance()->addEntry(s_moduleId, filepath, entry);
 }
 
 } // namespace QQmlJS
diff --git a/src/qmlcompiler/qqmljscompilerstats_p.h b/src/qmlcompiler/qqmljscompilerstats_p.h
index abd89c4a20..53ebb9f777 100644
--- a/src/qmlcompiler/qqmljscompilerstats_p.h
+++ b/src/qmlcompiler/qqmljscompilerstats_p.h
@@ -50,8 +50,8 @@ public:
         return m_entries;
     }
 
-    void addEntry(const QString &moduleId, const QString &filepath, AotStatsEntry entry);
-    void insert(AotStats other);
+    void addEntry(const QString &moduleId, const QString &filepath, const AotStatsEntry &entry);
+    void insert(const AotStats &other);
 
     bool saveToDisk(const QString &filepath) const;
 
@@ -74,10 +74,10 @@ public:
     static bool recordAotStats() { return s_recordAotStats; }
     static void setRecordAotStats(bool recordAotStats) { s_recordAotStats = recordAotStats; }
 
-    static const QString &moduleId() { return s_moduleId; }
-    static void setModuleId(QString moduleId) { s_moduleId = moduleId; }
+    static QString moduleId() { return s_moduleId; }
+    static void setModuleId(const QString &moduleId) { s_moduleId = moduleId; }
 
-    static void addEntry(QString filepath, QQmlJS::AotStatsEntry entry);
+    static void addEntry(const QString &filepath, const QQmlJS::AotStatsEntry &entry);
 
 private:
     static std::unique_ptr<AotStats> s_instance;
diff --git a/src/qmlcompiler/qqmljsutils_p.h b/src/qmlcompiler/qqmljsutils_p.h
index bca4b1df38..c23399e9ae 100644
--- a/src/qmlcompiler/qqmljsutils_p.h
+++ b/src/qmlcompiler/qqmljsutils_p.h
@@ -202,7 +202,7 @@ struct Q_QMLCOMPILER_EXPORT QQmlJSUtils
                                       const AliasResolutionVisitor &visitor);
 
     template<typename QQmlJSScopePtr, typename Action>
-    static bool searchBaseAndExtensionTypes(QQmlJSScopePtr type, const Action &check)
+    static bool searchBaseAndExtensionTypes(const QQmlJSScopePtr &type, const Action &check)
     {
         if (!type)
             return false;