diff options
-rw-r--r-- | src/src.pro | 2 | ||||
-rw-r--r-- | src/windeployqt/utils.cpp | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/src.pro b/src/src.pro index 861d06db3..a07a3bba8 100644 --- a/src/src.pro +++ b/src/src.pro @@ -15,7 +15,7 @@ qtHaveModule(widgets) { } SUBDIRS += linguist -!android|android_app: SUBDIRS += qtpaths +if(!android|android_app):!ios: SUBDIRS += qtpaths mac { SUBDIRS += macdeployqt diff --git a/src/windeployqt/utils.cpp b/src/windeployqt/utils.cpp index 358601c51..8d92e62e6 100644 --- a/src/windeployqt/utils.cpp +++ b/src/windeployqt/utils.cpp @@ -791,16 +791,16 @@ bool readPeExecutable(const QString &peExecutableFileName, QString *errorMessage } else { const IMAGE_NT_HEADERS64 *ntHeaders64 = reinterpret_cast<const IMAGE_NT_HEADERS64 *>(ntHeaders); - debug = ntHeaders64->OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_DEBUG].Size; - if (dependentLibrariesIn) - *dependentLibrariesIn = readImportSections(ntHeaders64, fileMemory, errorMessage); if (!isMinGW) { - debug = !(ntHeaders64->FileHeader.Characteristics & IMAGE_FILE_DEBUG_STRIPPED); + debug = ntHeaders64->OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_DEBUG].Size; } else { // Use logic that's used e.g. in objdump / pfd library debug = !(ntHeaders64->FileHeader.Characteristics & IMAGE_FILE_DEBUG_STRIPPED); } + + if (dependentLibrariesIn) + *dependentLibrariesIn = readImportSections(ntHeaders64, fileMemory, errorMessage); } if (isDebugIn) |