Commit 095946d4 authored by Christian Kandeler's avatar Christian Kandeler

Qt support: Don't set LD_LIBRARY_PATH for building

This does not make sense for non-Desktop versions, where it can cause
libraries from a sysroot to be erroneously picked up by executables in
build steps. Only set it for running desktop qt run configurations.

Change-Id: I3b098d5b1179eaefe20824b18a8976d68013d20d
Reviewed-by: default avatarDaniel Teske <daniel.teske@nokia.com>
Reviewed-by: default avatarOswald Buddenhagen <oswald.buddenhagen@nokia.com>
parent 5a09b265
......@@ -629,6 +629,10 @@ Utils::Environment Qt4RunConfiguration::baseEnvironment() const
} // foreach
} // libDirectories
} // node
QtSupport::BaseQtVersion *qtVersion = qt4Target()->activeQt4BuildConfiguration()->qtVersion();
if (qtVersion)
env.prependOrSetLibrarySearchPath(qtVersion->versionInfo().value(QLatin1String("QT_INSTALL_LIBS")));
return env;
}
......
......@@ -890,7 +890,6 @@ void BaseQtVersion::addToEnvironment(Utils::Environment &env) const
{
env.set(QLatin1String("QTDIR"), QDir::toNativeSeparators(versionInfo().value(QLatin1String("QT_INSTALL_DATA"))));
env.prependOrSetPath(versionInfo().value(QLatin1String("QT_INSTALL_BINS")));
env.prependOrSetLibrarySearchPath(versionInfo().value(QLatin1String("QT_INSTALL_LIBS")));
}
bool BaseQtVersion::hasGdbDebuggingHelper() const
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment