diff options
| author | Samuel Gaist <samuel.gaist@edeltech.ch> | 2014-06-25 00:47:51 +0200 |
|---|---|---|
| committer | Samuel Gaist <samuel.gaist@edeltech.ch> | 2014-08-28 14:01:15 +0200 |
| commit | 8c79a098b8b7da4832ebca1884ee833a2c2078a7 (patch) | |
| tree | 2710e7911c14e70b51c2aebb4b4669de71258a02 | |
| parent | 32bb805deb7339918986a6305b769939b005e830 (diff) | |
macdeployqt: don't use hardcoded lib/ when searching for dylib
Currently when parsing otool output for dylibs, "lib/" is appended to
the path. However dylibs might not be always found in a lib folder like
e.g. the mysql client libraries from macports. This patch aims to remove
that hardcoded path and use the data from the currently parsed otool
line.
[ChangeLog][OS X][macdeployt] Fixed a bug where dynamic libraries where
searched in the wrong directory
Task-number: QTBUG-21913
Change-Id: I992d15bc48ad827185216852108b2d0a5633043e
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
Reviewed-by: Jake Petroules <jake.petroules@petroules.com>
| -rw-r--r-- | src/macdeployqt/shared/shared.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/macdeployqt/shared/shared.cpp b/src/macdeployqt/shared/shared.cpp index 32bab47c3..50b5878bf 100644 --- a/src/macdeployqt/shared/shared.cpp +++ b/src/macdeployqt/shared/shared.cpp @@ -163,8 +163,7 @@ FrameworkInfo parseOtoolLibraryLine(const QString &line, bool useDebugLibs) if (state == QtPath) { // Check for library name part if (part < parts.count() && parts.at(part).contains(".dylib ")) { - state = DylibName; - info.installName += "/" + (qtPath + "lib/").simplified(); + info.installName += "/" + (qtPath + currentPart + "/").simplified(); info.frameworkDirectory = info.installName; state = DylibName; continue; |