From 8ab887297c84c9a0e8fb16e36a25033a4790b3dc Mon Sep 17 00:00:00 2001
From: Daniel Teske <daniel.teske@nokia.com>
Date: Tue, 4 Oct 2011 15:40:30 +0200
Subject: [PATCH] Use builddir not project dir for expanding relative libs
paths
Change-Id: Id9743739fafe42c3d0f695cec0342b68544c64b0
Reviewed-on: http://codereview.qt-project.org/5992
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
---
.../qt4projectmanager/qt-desktop/qt4runconfiguration.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/plugins/qt4projectmanager/qt-desktop/qt4runconfiguration.cpp b/src/plugins/qt4projectmanager/qt-desktop/qt4runconfiguration.cpp
index a233df60e15..feec72dcd0b 100644
--- a/src/plugins/qt4projectmanager/qt-desktop/qt4runconfiguration.cpp
+++ b/src/plugins/qt4projectmanager/qt-desktop/qt4runconfiguration.cpp
@@ -619,7 +619,7 @@ Utils::Environment Qt4RunConfiguration::baseEnvironment() const
if (node) {
const QStringList libDirectories = node->variableValue(LibDirectoriesVar);
if (!libDirectories.isEmpty()) {
- const QString proDirectory = QFileInfo(node->path()).absolutePath();
+ const QString proDirectory = node->buildDir();
foreach (QString dir, libDirectories) {
// Fix up relative entries like "LIBS+=-L.."
const QFileInfo fi(dir);
--
GitLab