From d4e0c8ce241a5b145c59f345f6a55c2616242fcb Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Wed, 27 Jul 2011 10:10:33 +0200 Subject: [PATCH] Guard macdeployqt against @rpath and @loader_path too. Ported from 4.8 2ccef4f57f036a486cb96904298a8b4673ff0aec Change-Id: I01f6449ebdb610684d0aab3a37fe66ed0a37b522 Reviewed-on: http://codereview.qt.nokia.com/2256 Reviewed-by: Qt Sanity Bot Reviewed-by: Eike Ziller --- src/macdeployqt/shared/shared.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/macdeployqt/shared/shared.cpp b/src/macdeployqt/shared/shared.cpp index 74dd4a4..bb37f0b 100644 --- a/src/macdeployqt/shared/shared.cpp +++ b/src/macdeployqt/shared/shared.cpp @@ -111,7 +111,7 @@ FrameworkInfo parseOtoolLibraryLine(const QString &line, bool useDebugLibs) // Don't deploy system libraries. if (trimmed.startsWith("/System/Library/") || (trimmed.startsWith("/usr/lib/") && trimmed.contains("libQt") == false) // exception for libQtuitools and libQtlucene - || trimmed.startsWith("@executable_path")) + || trimmed.startsWith("@executable_path") || trimmed.startsWith("@loader_path") || trimmed.startsWith("@rpath")) return info; enum State {QtPath, FrameworkName, DylibName, Version, End}; @@ -238,7 +238,7 @@ QList getQtFrameworks(const QString &path, bool useDebugLibs) QStringList outputLines = output.split("\n"); outputLines.removeFirst(); // remove line containing the binary path if (path.contains(".framework") || path.contains(".dylib")) - outputLines.removeFirst(); // frameworks and dylibs lists themselves as a dependency. + outputLines.removeFirst(); // frameworks and dylibs print install name of themselves first. return getQtFrameworks(outputLines, useDebugLibs); } -- 2.7.4