diff --git a/src/plugins/qt4projectmanager/qt-desktop/qt4runconfiguration.cpp b/src/plugins/qt4projectmanager/qt-desktop/qt4runconfiguration.cpp index afa912882b5ebe56a8dcd35ea7d438c91314f29c..25f26f308b8e01b69a5025579a1519e633e33dc2 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 db1075999dea80a6b553852568075981c674436f..de449dc8df437f7905184b28a3fa291b3fa3cbe6 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