summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorEike Ziller <eike.ziller@nokia.com>2011-07-26 14:00:58 (GMT)
committerEike Ziller <eike.ziller@nokia.com>2011-07-26 15:31:07 (GMT)
commit2ccef4f57f036a486cb96904298a8b4673ff0aec (patch)
tree4bffa0334bd52b975dbdd69c1f860b07357d7bd8 /tools
parent0b16c7a8a5522e3bc7414130dc609763bc2f4e3d (diff)
downloadQt-2ccef4f57f036a486cb96904298a8b4673ff0aec.zip
Qt-2ccef4f57f036a486cb96904298a8b4673ff0aec.tar.gz
Qt-2ccef4f57f036a486cb96904298a8b4673ff0aec.tar.bz2
Guard macdeployqt against @rpath and @loader_path too.
Reviewed-by: TrustMe
Diffstat (limited to 'tools')
-rw-r--r--tools/macdeployqt/shared/shared.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/macdeployqt/shared/shared.cpp b/tools/macdeployqt/shared/shared.cpp
index 74dd4a4..bb37f0b 100644
--- a/tools/macdeployqt/shared/shared.cpp
+++ b/tools/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<FrameworkInfo> 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);
}