From c2ef84999704d741b4797df59faff7a3da6dc594 Mon Sep 17 00:00:00 2001 From: Daniel Teske Date: Wed, 2 Sep 2015 17:06:58 +0200 Subject: [PATCH] Environment::prependOrSetLibrarySearchPath: Set DYLD_LIBRARY_PATH on OS X Change-Id: I25a86189b9308f5ac557a705b32bb4986f1b4519 Task-number: QTCREATORBUG-14022 Reviewed-by: Eike Ziller --- src/libs/utils/environment.cpp | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/libs/utils/environment.cpp b/src/libs/utils/environment.cpp index d26d16ce54c..a7e48c34b7f 100644 --- a/src/libs/utils/environment.cpp +++ b/src/libs/utils/environment.cpp @@ -193,6 +193,13 @@ void Environment::prependOrSetLibrarySearchPath(const QString &value) prependOrSet(path, QDir::toNativeSeparators(value), QString(sep)); break; } + case OsTypeMac: { + const QString sep = QLatin1String(":"); + const QString nativeValue = QDir::toNativeSeparators(value); + prependOrSet(QLatin1String("DYLD_LIBRARY_PATH"), nativeValue, sep); + prependOrSet(QLatin1String("DYLD_FRAMEWORK_PATH"), nativeValue, sep); + break; + } case OsTypeLinux: case OsTypeOtherUnix: { const QChar sep = QLatin1Char(':'); @@ -200,7 +207,7 @@ void Environment::prependOrSetLibrarySearchPath(const QString &value) prependOrSet(path, QDir::toNativeSeparators(value), QString(sep)); break; } - default: // we could set DYLD_LIBRARY_PATH on Mac but it is unnecessary in practice + default: break; } }