windeployqt: Fix some Clang warnings

- Use range-based for
- Remove else after return
- Use member initialization
- Dubious check of bool *
- Prefer static QFileInfo::exists()
- Use uninitialized struct QJsonParseError

Change-Id: If2705d6829ba3186cafb068a2c083943d33d1c66
Reviewed-by: Andre de la Rocha <andre.rocha@qt.io>
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>

3 files changed, 5 insertions, 8 deletions

diff --git a/src/shared/winutils/qmlutils.cpp b/src/shared/winutils/qmlutils.cpp
index 6fe77e64f..e66d30554 100644
--- a/src/shared/winutils/qmlutils.cpp
+++ b/src/shared/winutils/qmlutils.cpp
@@ -51,7 +51,7 @@ QString QmlImportScanResult::Module::installPath(const QString &root) const
     const int lastSlashPos = relativePath.lastIndexOf(QLatin1Char('/'));
     if (lastSlashPos != -1) {
         result += QLatin1Char('/');
-        result += relativePath.left(lastSlashPos);
+        result += relativePath.leftRef(lastSlashPos);
     }
     return result;
 }
@@ -114,7 +114,7 @@ QmlImportScanResult runQmlImportScanner(const QString &directory, const QString
                         + QStringLiteral(": ") + QString::fromLocal8Bit(stdErr);
         return result;
     }
-    QJsonParseError jsonParseError;
+    QJsonParseError jsonParseError{};
     const QJsonDocument data = QJsonDocument::fromJson(stdOut, &jsonParseError);
     if (data.isNull() ) {
         *errorMessage = binary + QStringLiteral(" returned invalid JSON output: ")
diff --git a/src/shared/winutils/qmlutils.h b/src/shared/winutils/qmlutils.h
index 895c7f1de..267f6d92a 100644
--- a/src/shared/winutils/qmlutils.h
+++ b/src/shared/winutils/qmlutils.h
@@ -47,10 +47,9 @@ struct QmlImportScanResult {
         QString relativePath;
     };
 
-    QmlImportScanResult() : ok(false) {}
     void append(const QmlImportScanResult &other);
 
-    bool ok;
+    bool ok = false;
     QList<Module> modules;
     QStringList plugins;
 };
diff --git a/src/shared/winutils/utils.cpp b/src/shared/winutils/utils.cpp
index 195d8efd5..00a205438 100644
--- a/src/shared/winutils/utils.cpp
+++ b/src/shared/winutils/utils.cpp
@@ -493,8 +493,6 @@ QString findInPath(const QString &file)
 
 const char *qmakeInfixKey = "QT_INFIX";
 
-QMap<QString, QString> queryQMakeAll(QString *errorMessage);
-
 QMap<QString, QString> queryQMakeAll(QString *errorMessage)
 {
     QByteArray stdOut;
@@ -819,12 +817,12 @@ inline void determineDebugAndDependentLibs(const ImageNtHeader *nth, const void
 {
     const bool hasDebugEntry = nth->OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_DEBUG].Size;
     QStringList dependentLibraries;
-    if (dependentLibrariesIn || (isDebugIn && hasDebugEntry && !isMinGW))
+    if (dependentLibrariesIn || (isDebugIn != nullptr && hasDebugEntry && !isMinGW))
         dependentLibraries = readImportSections(nth, fileMemory, errorMessage);
 
     if (dependentLibrariesIn)
         *dependentLibrariesIn = dependentLibraries;
-    if (isDebugIn) {
+    if (isDebugIn != nullptr) {
         if (isMinGW) {
             // Use logic that's used e.g. in objdump / pfd library
             *isDebugIn = !(nth->FileHeader.Characteristics & IMAGE_FILE_DEBUG_STRIPPED);