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

9
src/plugins/qt4projectmanager/qtversionmanager.cpp
View File

@@ -1722,7 +1722,14 @@ void QtVersion::addToEnvironment(Utils::Environment &env) const
// Generic:
env.set("QTDIR", QDir::toNativeSeparators(versionInfo().value("QT_INSTALL_DATA")));
env.prependOrSetPath(versionInfo().value("QT_INSTALL_BINS"));
env.prependOrSetLibrarySearchPath(versionInfo().value("QT_INSTALL_LIBS"));
// set LD_LIBRARY_PATH for generic linux
foreach (const ProjectExplorer::Abi &abi, qtAbis()) {
if (abi.osFlavor() == ProjectExplorer::Abi::GenericLinuxFlavor) {
env.prependOrSet(QLatin1String("LD_LIBRARY_PATH"), versionInfo().value("QT_INSTALL_LIBS"), QLatin1String(":"));
break;
}
}
// Symbian specific:
if (supportsTargetId(Constants::S60_DEVICE_TARGET_ID)