From 095946d4413c865673b6f6425dcb6d2a2586a34d Mon Sep 17 00:00:00 2001
From: Christian Kandeler <christian.kandeler@nokia.com>
Date: Mon, 30 Jan 2012 15:37:32 +0100
Subject: [PATCH] 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: Daniel Teske <daniel.teske@nokia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
---
.../qt4projectmanager/qt-desktop/qt4runconfiguration.cpp | 4 ++++
src/plugins/qtsupport/baseqtversion.cpp | 1 -
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/src/plugins/qt4projectmanager/qt-desktop/qt4runconfiguration.cpp b/src/plugins/qt4projectmanager/qt-desktop/qt4runconfiguration.cpp
index afa912882b5..25f26f308b8 100644
--- a/src/plugins/qt4projectmanager/qt-desktop/qt4runconfiguration.cpp
+++ b/src/plugins/qt4projectmanager/qt-desktop/qt4runconfiguration.cpp
@@ -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;
}
diff --git a/src/plugins/qtsupport/baseqtversion.cpp b/src/plugins/qtsupport/baseqtversion.cpp
index db1075999de..de449dc8df4 100644
--- a/src/plugins/qtsupport/baseqtversion.cpp
+++ b/src/plugins/qtsupport/baseqtversion.cpp
@@ -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
--
GitLab