diff options
| author | Kai Koehne <kai.koehne@digia.com> | 2014-04-10 09:47:00 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-04-11 09:34:17 +0200 |
| commit | d096e023fc20ba931aa5a53c88b533ea9e0f5e25 (patch) | |
| tree | 034f4aa43afabac3347226d59b234ec5561b590e | |
| parent | e2710f83dfad87b9380090640718e627494636f9 (diff) | |
| download | qttools-d096e023fc20ba931aa5a53c88b533ea9e0f5e25.tar.gz | |
windeployqt: Fix check for MSVC 64 bit debug build
Fix a regression introduced in commit e2710f83dfad87b938009.
Change-Id: I2d5fc15cfd52a6901fa5e44b97af0996650da6dd
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
| -rw-r--r-- | src/windeployqt/utils.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
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) |