From 878e38a2c893a6914b13674286ec6fc75bebbc6e Mon Sep 17 00:00:00 2001
From: Tobias Hunger <tobias.hunger@nokia.com>
Date: Thu, 8 Apr 2010 18:24:45 +0200
Subject: [PATCH] Use shadowbuilding information from Qt versions
---
.../qt4projectmanager/wizards/targetsetuppage.cpp | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/src/plugins/qt4projectmanager/wizards/targetsetuppage.cpp b/src/plugins/qt4projectmanager/wizards/targetsetuppage.cpp
index 0a5f7e33932..0a264e91930 100644
--- a/src/plugins/qt4projectmanager/wizards/targetsetuppage.cpp
+++ b/src/plugins/qt4projectmanager/wizards/targetsetuppage.cpp
@@ -285,10 +285,12 @@ TargetSetupPage::importInfosForKnownQtVersions(Qt4ProjectManager::Qt4Project *pr
validVersions.append(vm->versions().at(0)); // there is always one!
foreach (QtVersion *v, validVersions) {
ImportInfo info;
- // ToDo: Check whether shadowbuilding is possible and use sourcedir if not:
- // This needs a shadowbuilding patch to land
- if (project)
- info.directory = project->defaultTopLevelBuildDirectory();
+ if (project) {
+ if (v->supportsShadowBuilds())
+ info.directory = project->defaultTopLevelBuildDirectory();
+ else
+ info.directory = project->projectDirectory();
+ }
info.isExistingBuild = false;
info.isTemporary = false;
info.version = v;
--
GitLab