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

Revert "Fix setting of LD_LIBRARY_PATH in the run environment."

Browse Source 
This reverts commit 4ba7f2b7f3.
This commit is contained in:
dt_
2011-04-29 13:25:25 +02:00
parent 4ba7f2b7f3
commit 0811b24628
4 changed files with 21 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/plugins/qt4projectmanager/qt-desktop/qt4runconfiguration.cpp
View File

@@ -602,16 +602,11 @@ Utils::Environment Qt4RunConfiguration::baseEnvironment() const
// The user could be linking to a library found via a -L/some/dir switch
// to find those libraries while actually running we explicitly prepend those
// dirs to the library search path on windows/linux
// dirs to the library search path
const Qt4ProFileNode *node = qt4Target()->qt4Project()->rootProjectNode()->findProFileFor(m_proFilePath);
const ProjectExplorer::Abi runAbi = abi();
if (node)
foreach (const QString &dir, node->variableValue(LibDirectoriesVar)) {
if (runAbi.os() == ProjectExplorer::Abi::WindowsOS)
env.prependOrSetPath(dir);
else if (runAbi.osFlavor() == ProjectExplorer::Abi::GenericLinuxFlavor)
env.prependOrSet(QLatin1String("LD_LIBRARY_PATH"), dir, QLatin1String(":"));
}
foreach(const QString &dir, node->variableValue(LibDirectoriesVar))
env.prependOrSetLibrarySearchPath(dir);
return env;
}