1 files changed, 8 insertions, 6 deletions

diff --git a/tools/qmlimportscanner/main.cpp b/tools/qmlimportscanner/main.cpp
index b2ff751231..bac7694e17 100644
--- a/tools/qmlimportscanner/main.cpp
+++ b/tools/qmlimportscanner/main.cpp
@@ -146,7 +146,7 @@ QVariantMap pluginsForModulePath(const QString &modulePath) {
             classnames += QString::fromUtf8(line.split(' ').at(1));
             classnames += QLatin1Char(' ');
         } else if (line.startsWith("depends")) {
-            QList<QByteArray> dep = line.split(' ');
+            const QList<QByteArray> dep = line.split(' ');
             if (dep.length() != 3)
                 std::cerr << "depends: expected 2 arguments: module identifier and version" << std::endl;
             else
@@ -222,8 +222,8 @@ QVariantList findPathsForModuleImports(const QVariantList &imports)
     QVariantList importsCopy(imports);
 
     for (int i = 0; i < importsCopy.length(); ++i) {
-        QVariantMap import = qvariant_cast<QVariantMap>(importsCopy[i]);
-        if (import[typeLiteral()] == QLatin1String("module")) {
+        QVariantMap import = qvariant_cast<QVariantMap>(importsCopy.at(i));
+        if (import.value(typeLiteral()) == QLatin1String("module")) {
             const QPair<QString, QString> paths =
                 resolveImportPath(import.value(nameLiteral()).toString(), import.value(versionLiteral()).toString());
             if (!paths.first.isEmpty()) {
@@ -264,7 +264,8 @@ static QVariantList findQmlImportsInQmlCode(const QString &filePath, const QStri
 
     if (!parser.parse() || !parser.diagnosticMessages().isEmpty()) {
         // Extract errors from the parser
-        foreach (const QQmlJS::DiagnosticMessage &m, parser.diagnosticMessages()) {
+        const auto diagnosticMessages = parser.diagnosticMessages();
+        for (const QQmlJS::DiagnosticMessage &m : diagnosticMessages) {
             std::cerr << QDir::toNativeSeparators(filePath).toStdString() << ':'
                       << m.loc.startLine << ':' << m.message.toStdString() << std::endl;
         }
@@ -342,7 +343,8 @@ QVariantList findQmlImportsInJavascriptFile(const QString &filePath)
     QQmlJS::Parser parser(&ee);
     parser.parseProgram();
 
-    foreach (const QQmlJS::DiagnosticMessage &m, parser.diagnosticMessages())
+    const auto diagnosticMessages = parser.diagnosticMessages();
+    for (const QQmlJS::DiagnosticMessage &m : diagnosticMessages)
         if (m.isError())
             return QVariantList();
 
@@ -537,7 +539,7 @@ int main(int argc, char *argv[])
             if (arg.startsWith(QLatin1Char('-')) && arg != QLatin1String("-"))
                 break;
             ++i;
-            if (!QFile::exists(arg)) {
+            if (arg != QLatin1String("-") && !QFile::exists(arg)) {
                 std::cerr << qPrintable(appName) << ": No such file or directory: \""
                     << qPrintable(arg) << "\"\n";
                 return 1;