diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-09-16 15:29:38 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-09-16 15:29:38 +0200 |
| commit | 7d02c5e2e9329ef8075d965ce675515345b24dab (patch) | |
| tree | 7671c00279af138049e0b370cf474db825549086 /src/macdeployqt | |
| parent | c19d0217a515561bff8003e35ad233e27c16abf9 (diff) | |
| parent | f5f5057937e0a66229368a71a619c45043c04727 (diff) | |
| download | qttools-7d02c5e2e9329ef8075d965ce675515345b24dab.tar.gz | |
Merge remote-tracking branch 'origin/5.3' into 5.4
Conflicts:
.qmake.conf
Change-Id: I32718899f94175b7012ac5ba208fc18eb54b3ae9
Diffstat (limited to 'src/macdeployqt')
| -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 d2eeea094..e500bcbb0 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; |