feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Fix setting of LD_LIBRARY_PATH in the run environment.

Browse Source 
It's now only done if the *target*'s OS is of generic linux flavor.

Reviewed-by: con
Reviewed-by: Christian Kandeler
This commit is contained in:
Christian Kamm
2011-04-29 10:57:54 +02:00
parent 1689a2cded
commit 4ba7f2b7f3
4 changed files with 16 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/libs/utils/environment.cpp
View File

@@ -174,21 +174,6 @@ void Environment::prependOrSetPath(const QString &value)
prependOrSet(QLatin1String("PATH"), QDir::toNativeSeparators(value), QString(sep));
}
void Environment::prependOrSetLibrarySearchPath(const QString &value)
{
#ifdef Q_OS_MAC
// we could set DYLD_LIBRARY_PATH on Mac but it is unnecessary in practice
#elif Q_OS_WIN
const QChar sep = QLatin1Char(';');
const QLatin1String path("PATH");
prependOrSet(path, QDir::toNativeSeparators(value), QString(sep));
#elif Q_OS_UNIX
const QChar sep = QLatin1Char(':');
const QLatin1String path("LD_LIBRARY_PATH");
prependOrSet(path, QDir::toNativeSeparators(value), QString(sep));
#endif
}
Environment Environment::systemEnvironment()
{
return Environment(QProcess::systemEnvironment());