clang-tidy: fix 'bugprone-assignment-in-if-condition'

Change-Id: Ia53f439a73abcdcbc7fb743739280cfa489fa66a
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>

4 files changed, 15 insertions, 9 deletions

diff --git a/src/lib/corelib/api/runenvironment.cpp b/src/lib/corelib/api/runenvironment.cpp
index adf0c4557..23d0359b0 100644
--- a/src/lib/corelib/api/runenvironment.cpp
+++ b/src/lib/corelib/api/runenvironment.cpp
@@ -363,16 +363,16 @@ int RunEnvironment::doRunTarget(const QString &targetBin, const QStringList &arg
                                 << arguments;
             }
         } else {
-            if (QFileInfo(targetExecutable = findExecutable(QStringList()
-                        << QStringLiteral("iostool"))).isExecutable()) {
+            if (targetExecutable = findExecutable(QStringList{QStringLiteral("iostool")});
+                QFileInfo(targetExecutable).isExecutable()) {
                 targetArguments = QStringList()
                         << QStringLiteral("-run")
                         << QStringLiteral("-bundle")
                         << QDir::cleanPath(bundlePath);
                 if (!arguments.empty())
                     targetArguments << QStringLiteral("-extra-args") << arguments;
-            } else if (QFileInfo(targetExecutable = findExecutable(QStringList()
-                        << QStringLiteral("ios-deploy"))).isExecutable()) {
+            } else if (targetExecutable = findExecutable(QStringList{QStringLiteral("ios-deploy")});
+                       QFileInfo(targetExecutable).isExecutable()) {
                 targetArguments = QStringList()
                         << QStringLiteral("--no-wifi")
                         << QStringLiteral("--noninteractive")
diff --git a/src/lib/corelib/buildgraph/inputartifactscanner.cpp b/src/lib/corelib/buildgraph/inputartifactscanner.cpp
index fb582c457..0c73f599f 100644
--- a/src/lib/corelib/buildgraph/inputartifactscanner.cpp
+++ b/src/lib/corelib/buildgraph/inputartifactscanner.cpp
@@ -103,9 +103,14 @@ static void resolveDepencency(const RawScannedDependency &dependency,
     }
 
     // prioritize found artifacts
-    if ((result->file = dependencyInProduct)
-        || (result->file = dependencyInOtherProduct)
-        || (result->file = fileDependencyArtifact)) {
+    if (dependencyInProduct)
+        result->file = dependencyInProduct;
+    else if (dependencyInOtherProduct)
+        result->file = dependencyInOtherProduct;
+    else
+        result->file = fileDependencyArtifact;
+
+    if (result->file) {
         result->filePath = result->file->filePath();
 
         if (result->file == dependencyInOtherProduct && !productOfDependencyIsDependency) {
diff --git a/src/lib/corelib/language/item.cpp b/src/lib/corelib/language/item.cpp
index cabfefb0b..e5de8f195 100644
--- a/src/lib/corelib/language/item.cpp
+++ b/src/lib/corelib/language/item.cpp
@@ -142,7 +142,8 @@ ValuePtr Item::property(const QString &name) const
     ValuePtr value;
     const Item *item = this;
     do {
-        if ((value = item->m_properties.value(name)))
+        value = item->m_properties.value(name);
+        if (value)
             break;
         item = item->m_prototype;
     } while (item);
diff --git a/src/lib/corelib/loader/dependenciesresolver.cpp b/src/lib/corelib/loader/dependenciesresolver.cpp
index 5df47217f..b173e4b8a 100644
--- a/src/lib/corelib/loader/dependenciesresolver.cpp
+++ b/src/lib/corelib/loader/dependenciesresolver.cpp
@@ -432,7 +432,7 @@ LoadModuleResult DependenciesResolver::loadModule(
                                                              dependency.parameters);
     } else if (dependency.product) {
         productDep = dependency.product; // We have already done the look-up.
-    } else if (!(productDep = findMatchingProduct(dependency))) {
+    } else if (productDep = findMatchingProduct(dependency); !productDep) {
         moduleItem = findMatchingModule(dependency);
     }