diff options
| author | Jani Heikkinen <jani.heikkinen@digia.com> | 2014-04-23 12:46:44 +0300 |
|---|---|---|
| committer | Jani Heikkinen <jani.heikkinen@digia.com> | 2014-04-23 12:46:44 +0300 |
| commit | 0bc132e0b7c10cc884dd6cfbb9f287aa03d8ff19 (patch) | |
| tree | 36b75cf4cbba6dbea7b3ae864382ac68895bca82 | |
| parent | e7b791c8bb5e64a4c786bf370b10366815af704f (diff) | |
| parent | ff473ef32fdbcd4a7ed72e8e23480b197b40adc2 (diff) | |
| download | qttools-0bc132e0b7c10cc884dd6cfbb9f287aa03d8ff19.tar.gz | |
Merge remote-tracking branch 'origin/release' into stable
Change-Id: If733be66da6ef6b1e28ec6ba180beafea6c9990d
| -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) |