diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2018-11-14 11:26:27 +0100 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2018-12-12 08:22:51 +0000 |
| commit | f640dd08ca46c8657aab38d0c3d5dc350b0035cd (patch) | |
| tree | 03bc123e15119eecc9f3af36464a55963b5093b2 /src/shared/winutils/utils.cpp | |
| parent | 7301cd2df11d07eb58cbfb443348e31c86a00ccf (diff) | |
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>
Diffstat (limited to 'src/shared/winutils/utils.cpp')
| -rw-r--r-- | src/shared/winutils/utils.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
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); |