1 files changed, 15 insertions, 15 deletions

diff --git a/src/lib/corelib/buildgraph/inputartifactscanner.cpp b/src/lib/corelib/buildgraph/inputartifactscanner.cpp
index 05bbc0d4b..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) {
@@ -158,7 +163,7 @@ void InputArtifactScanner::scan()
     for (Artifact * const dependency : childrenAddedByScanner)
         disconnect(m_artifact, dependency);
 
-    for (Artifact * const inputArtifact : qAsConst(m_artifact->transformer->inputs))
+    for (Artifact * const inputArtifact : std::as_const(m_artifact->transformer->inputs))
         scanForFileDependencies(inputArtifact);
 }
 
@@ -224,7 +229,7 @@ Set<DependencyScanner *> InputArtifactScanner::scannersForArtifact(const Artifac
                 }
             }
         }
-        for (const DependencyScannerPtr &scanner : qAsConst(cache.scanners))
+        for (const DependencyScannerPtr &scanner : std::as_const(cache.scanners))
             scanners += scanner.get();
     }
     return scanners;
@@ -243,21 +248,16 @@ void InputArtifactScanner::scanForScannerFileDependencies(DependencyScanner *sca
         cache.searchPaths = scanner->collectSearchPaths(inputArtifact);
     }
     qCDebug(lcDepScan) << "include paths (cache" << (cacheHit ? "hit)" : "miss)");
-    for (const QString &s : qAsConst(cache.searchPaths))
+    for (const QString &s : std::as_const(cache.searchPaths))
         qCDebug(lcDepScan) << "    " << s;
 
     const QString &filePathToBeScanned = fileToBeScanned->filePath();
     RawScanResults::ScanData &scanData = m_rawScanResults.findScanData(fileToBeScanned, scanner,
                                                                        m_artifact->properties);
     if (scanData.lastScanTime < fileToBeScanned->timestamp()) {
-        try {
-            qCDebug(lcDepScan) << "scanning" << FileInfo::fileName(filePathToBeScanned);
-            scanWithScannerPlugin(scanner, inputArtifact, fileToBeScanned, &scanData.rawScanResult);
-            scanData.lastScanTime = FileTime::currentTime();
-        } catch (const ErrorInfo &error) {
-            m_logger.printWarning(error);
-            return;
-        }
+        qCDebug(lcDepScan) << "scanning" << FileInfo::fileName(filePathToBeScanned);
+        scanWithScannerPlugin(scanner, inputArtifact, fileToBeScanned, &scanData.rawScanResult);
+        scanData.lastScanTime = FileTime::currentTime();
     }
 
     resolveScanResultDependencies(inputArtifact, scanData.rawScanResult, filesToScan, cache);
@@ -289,7 +289,7 @@ void InputArtifactScanner::resolveScanResultDependencies(const Artifact *inputAr
         }
 
         // try include paths
-        for (const QString &includePath : qAsConst(cache.searchPaths)) {
+        for (const QString &includePath : std::as_const(cache.searchPaths)) {
             resolveDepencency(dependency, inputArtifact->product.get(),
                               &resolvedDependency, includePath);
             if (resolvedDependency.isValid())