From 9e5c6518c0c1916b8b10c107f2f548c2be66b7f1 Mon Sep 17 00:00:00 2001 From: Daniel Teske Date: Tue, 4 Sep 2012 11:30:11 +0200 Subject: [PATCH] Qt4BuildConfiguration: Allow relative paths for the build directory Task-number: QTCREATORBUG-7791 Change-Id: Ied2dcd8f8ccb16f427d60c6f6b2d93afb4c4b7e4 Reviewed-by: Tobias Hunger --- src/plugins/qt4projectmanager/qt4buildconfiguration.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/plugins/qt4projectmanager/qt4buildconfiguration.cpp b/src/plugins/qt4projectmanager/qt4buildconfiguration.cpp index 9def2f76210..29076cde49d 100644 --- a/src/plugins/qt4projectmanager/qt4buildconfiguration.cpp +++ b/src/plugins/qt4projectmanager/qt4buildconfiguration.cpp @@ -196,7 +196,8 @@ QString Qt4BuildConfiguration::rawBuildDirectory() const /// returns the build directory QString Qt4BuildConfiguration::buildDirectory() const { - return QDir::cleanPath(environment().expandVariables(rawBuildDirectory())); + QString path = QDir::cleanPath(environment().expandVariables(rawBuildDirectory())); + return QDir::cleanPath(QDir(target()->project()->projectDirectory()).absoluteFilePath(path)); } bool Qt4BuildConfiguration::supportsShadowBuilds()