13 files changed, 31 insertions, 21 deletions
diff --git a/src/lib/corelib/tools/buildgraphlocker.cpp b/src/lib/corelib/tools/buildgraphlocker.cpp
index c166c6e2d..28a58e3f4 100644
--- a/src/lib/corelib/tools/buildgraphlocker.cpp
+++ b/src/lib/corelib/tools/buildgraphlocker.cpp
@@ -55,8 +55,8 @@
 namespace qbs {
 namespace Internal {
 
-DirectoryManager::DirectoryManager(const QString &dir, const Logger &logger)
-    : m_dir(dir), m_logger(logger)
+DirectoryManager::DirectoryManager(QString dir, Logger logger)
+    : m_dir(std::move(dir)), m_logger(std::move(logger))
 {
     rememberCreatedDirectories();
 }
diff --git a/src/lib/corelib/tools/buildgraphlocker.h b/src/lib/corelib/tools/buildgraphlocker.h
index 17d452130..f85fc0768 100644
--- a/src/lib/corelib/tools/buildgraphlocker.h
+++ b/src/lib/corelib/tools/buildgraphlocker.h
@@ -55,7 +55,7 @@ class ProgressObserver;
 class DirectoryManager
 {
 public:
-    DirectoryManager(const QString &dir, const Logger &logger);
+    DirectoryManager(QString dir, Logger logger);
     ~DirectoryManager();
     QString dir() const { return m_dir; }
 
diff --git a/src/lib/corelib/tools/executablefinder.cpp b/src/lib/corelib/tools/executablefinder.cpp
index 7c5d1210e..4342c82f0 100644
--- a/src/lib/corelib/tools/executablefinder.cpp
+++ b/src/lib/corelib/tools/executablefinder.cpp
@@ -64,10 +64,9 @@ static QStringList populateExecutableSuffixes()
 
 QStringList ExecutableFinder::m_executableSuffixes = populateExecutableSuffixes();
 
-ExecutableFinder::ExecutableFinder(const ResolvedProductPtr &m_product,
-        const QProcessEnvironment &env)
-    : m_product(m_product)
-    , m_environment(env)
+ExecutableFinder::ExecutableFinder(ResolvedProductPtr product, QProcessEnvironment env)
+    : m_product(std::move(product))
+    , m_environment(std::move(env))
 {
 }
 
diff --git a/src/lib/corelib/tools/executablefinder.h b/src/lib/corelib/tools/executablefinder.h
index cb965b5d1..55a8cbe3a 100644
--- a/src/lib/corelib/tools/executablefinder.h
+++ b/src/lib/corelib/tools/executablefinder.h
@@ -53,7 +53,7 @@ namespace Internal {
 class ExecutableFinder
 {
 public:
-    ExecutableFinder(const ResolvedProductPtr &product, const QProcessEnvironment &env);
+    ExecutableFinder(ResolvedProductPtr product, QProcessEnvironment env);
 
     QString findExecutable(const QString &path, const QString &workingDirPath);
 
diff --git a/src/lib/corelib/tools/filesaver.cpp b/src/lib/corelib/tools/filesaver.cpp
index 0fd652657..5a0a68c1f 100644
--- a/src/lib/corelib/tools/filesaver.cpp
+++ b/src/lib/corelib/tools/filesaver.cpp
@@ -48,8 +48,8 @@
 namespace qbs {
 namespace Internal {
 
-FileSaver::FileSaver(const std::string &filePath, bool overwriteIfUnchanged)
-    : m_filePath(filePath), m_overwriteIfUnchanged(overwriteIfUnchanged)
+FileSaver::FileSaver(std::string filePath, bool overwriteIfUnchanged)
+    : m_filePath(std::move(filePath)), m_overwriteIfUnchanged(overwriteIfUnchanged)
 {
 }
 
diff --git a/src/lib/corelib/tools/filesaver.h b/src/lib/corelib/tools/filesaver.h
index 275ad0f01..8b4c01669 100644
--- a/src/lib/corelib/tools/filesaver.h
+++ b/src/lib/corelib/tools/filesaver.h
@@ -55,7 +55,7 @@ namespace Internal {
  */
 class QBS_EXPORT FileSaver {
 public:
-    FileSaver(const std::string &filePath, bool overwriteIfUnchanged = false);
+    FileSaver(std::string filePath, bool overwriteIfUnchanged = false);
 
     std::ostream *device();
     bool open();
diff --git a/src/lib/corelib/tools/msvcinfo.cpp b/src/lib/corelib/tools/msvcinfo.cpp
index cbec7b457..c1312c8c9 100644
--- a/src/lib/corelib/tools/msvcinfo.cpp
+++ b/src/lib/corelib/tools/msvcinfo.cpp
@@ -121,7 +121,7 @@ static QByteArray runProcess(const QString &exeFilePath, const QStringList &args
 
 class DummyFile {
 public:
-    DummyFile(const QString &fp) : filePath(fp) { }
+    DummyFile(QString fp) : filePath(std::move(fp)) { }
     ~DummyFile() { QFile::remove(filePath); }
     const QString filePath;
 };
diff --git a/src/lib/corelib/tools/preferences.cpp b/src/lib/corelib/tools/preferences.cpp
index 644c2722f..4db271758 100644
--- a/src/lib/corelib/tools/preferences.cpp
+++ b/src/lib/corelib/tools/preferences.cpp
@@ -1,3 +1,5 @@
+#include <utility>
+
 /****************************************************************************
 **
 ** Copyright (C) 2016 The Qt Company Ltd.
@@ -51,13 +53,13 @@ namespace qbs {
  * If a non-empty \c profileName is given, the profile's preferences take precedence over global
  * ones. Otherwise, the global preferences are used.
  */
-Preferences::Preferences(Settings *settings, const QString &profileName)
-    : m_settings(settings), m_profile(profileName)
+Preferences::Preferences(Settings *settings, QString profileName)
+    : m_settings(settings), m_profile(std::move(profileName))
 {
 }
 
-Preferences::Preferences(Settings *settings, const QVariantMap &profileContents)
-    : m_settings(settings), m_profileContents(profileContents)
+Preferences::Preferences(Settings *settings, QVariantMap profileContents)
+    : m_settings(settings), m_profileContents(std::move(profileContents))
 {
 }
 
diff --git a/src/lib/corelib/tools/preferences.h b/src/lib/corelib/tools/preferences.h
index 661b39d7f..2824ebf2c 100644
--- a/src/lib/corelib/tools/preferences.h
+++ b/src/lib/corelib/tools/preferences.h
@@ -54,8 +54,8 @@ class Settings;
 class QBS_EXPORT Preferences
 {
 public:
-    explicit Preferences(Settings *settings, const QString &profileName = QString());
-    Preferences(Settings *settings, const QVariantMap &profileContents);
+    explicit Preferences(Settings *settings, QString profileName = QString());
+    Preferences(Settings *settings, QVariantMap profileContents);
 
     bool useColoredOutput() const;
     int jobs() const;
diff --git a/src/lib/corelib/tools/settingscreator.cpp b/src/lib/corelib/tools/settingscreator.cpp
index cddc3b93d..eaaf2802c 100644
--- a/src/lib/corelib/tools/settingscreator.cpp
+++ b/src/lib/corelib/tools/settingscreator.cpp
@@ -1,3 +1,5 @@
+#include <utility>
+
 /****************************************************************************
 **
 ** Copyright (C) 2016 The Qt Company Ltd.
@@ -56,8 +58,9 @@ static QSettings::Format format()
 }
 
 
-SettingsCreator::SettingsCreator(const QString &baseDir)
-    : m_settingsBaseDir(baseDir), m_qbsVersion(Version::fromString(QLatin1String(QBS_VERSION)))
+SettingsCreator::SettingsCreator(QString baseDir)
+    : m_settingsBaseDir(std::move(baseDir))
+    , m_qbsVersion(Version::fromString(QLatin1String(QBS_VERSION)))
 {
 }
 
diff --git a/src/lib/corelib/tools/settingscreator.h b/src/lib/corelib/tools/settingscreator.h
index 6bc2a5cb7..39da80a7f 100644
--- a/src/lib/corelib/tools/settingscreator.h
+++ b/src/lib/corelib/tools/settingscreator.h
@@ -56,7 +56,7 @@ namespace Internal {
 class SettingsCreator
 {
 public:
-    SettingsCreator(const QString &baseDir);
+    SettingsCreator(QString baseDir);
 
     QSettings *getQSettings();
 
diff --git a/src/lib/corelib/tools/setupprojectparameters.cpp b/src/lib/corelib/tools/setupprojectparameters.cpp
index 6b13570d7..6d817c8f3 100644
--- a/src/lib/corelib/tools/setupprojectparameters.cpp
+++ b/src/lib/corelib/tools/setupprojectparameters.cpp
@@ -109,6 +109,8 @@ SetupProjectParameters::SetupProjectParameters(const SetupProjectParameters &oth
 {
 }
 
+SetupProjectParameters::SetupProjectParameters(SetupProjectParameters &&other) Q_DECL_NOEXCEPT = default;
+
 SetupProjectParameters::~SetupProjectParameters()
 {
 }
@@ -119,6 +121,8 @@ SetupProjectParameters &SetupProjectParameters::operator=(const SetupProjectPara
     return *this;
 }
 
+SetupProjectParameters &SetupProjectParameters::operator=(SetupProjectParameters &&other) Q_DECL_NOEXCEPT = default;
+
 /*!
  * \brief Returns the name of the top-level profile for building the project.
  */
diff --git a/src/lib/corelib/tools/setupprojectparameters.h b/src/lib/corelib/tools/setupprojectparameters.h
index c462ca212..cf3b200cb 100644
--- a/src/lib/corelib/tools/setupprojectparameters.h
+++ b/src/lib/corelib/tools/setupprojectparameters.h
@@ -65,9 +65,11 @@ class QBS_EXPORT SetupProjectParameters
 public:
     SetupProjectParameters();
     SetupProjectParameters(const SetupProjectParameters &other);
+    SetupProjectParameters(SetupProjectParameters &&other) Q_DECL_NOEXCEPT;
     ~SetupProjectParameters();
 
     SetupProjectParameters &operator=(const SetupProjectParameters &other);
+    SetupProjectParameters &operator=(SetupProjectParameters &&other) Q_DECL_NOEXCEPT;
 
     QString topLevelProfile() const;
     void setTopLevelProfile(const QString &profile);